@hairy/utils 1.0.16 → 1.0.17

package/index.cjs.js

@@ -9,7 +9,7 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 
 var dayjs__default = /*#__PURE__*/_interopDefaultLegacy(dayjs);
 
-const blendColor = (colorOne, colorTwo, ratio) => {
+const colourBlend = (colorOne, colorTwo, ratio) => {
   ratio = Math.max(Math.min(Number(ratio), 1), 0);
   const r1 = parseInt(colorOne.slice(1, 3), 16);
   const g1 = parseInt(colorOne.slice(3, 5), 16);
@@ -35,18 +35,18 @@ const hexToRgba = (hex, opacity) => {
   };
 };
 const fuseThemeColor = (color) => ({
-  "primaryColorLight-2": blendColor("#ffffff", color, 0.8),
-  "primaryColorLight-4": blendColor("#ffffff", color, 0.6),
-  "primaryColorLight-6": blendColor("#ffffff", color, 0.4),
-  "primaryColorLight-8": blendColor("#ffffff", color, 0.2),
-  "primaryColorDark-2": blendColor("#000000", color, 0.8),
-  "primaryColorDark-4": blendColor("#000000", color, 0.6),
-  "primaryColorDark-6": blendColor("#000000", color, 0.4),
-  "primaryColorDark-8": blendColor("#000000", color, 0.2),
-  "primaryColorOpacity-2": hexToRgba(color, 0.8).rgba,
-  "primaryColorOpacity-4": hexToRgba(color, 0.6).rgba,
-  "primaryColorOpacity-6": hexToRgba(color, 0.4).rgba,
-  "primaryColorOpacity-8": hexToRgba(color, 0.2).rgba
+  "light-2": colourBlend("#ffffff", color, 0.8),
+  "light-4": colourBlend("#ffffff", color, 0.6),
+  "light-6": colourBlend("#ffffff", color, 0.4),
+  "light-8": colourBlend("#ffffff", color, 0.2),
+  "dark-2": colourBlend("#000000", color, 0.8),
+  "dark-4": colourBlend("#000000", color, 0.6),
+  "dark-6": colourBlend("#000000", color, 0.4),
+  "dark-8": colourBlend("#000000", color, 0.2),
+  "opacity-2": hexToRgba(color, 0.8).rgba,
+  "opacity-4": hexToRgba(color, 0.6).rgba,
+  "opacity-6": hexToRgba(color, 0.4).rgba,
+  "opacity-8": hexToRgba(color, 0.2).rgba
 });
 
 const formatClearHtml = (string_) => string_.replace(/<[!/]*[^<>]*>/gi, "");
@@ -94,49 +94,18 @@ const isChrome = UA && /chrome\/\d+/.test(UA) && !isEdge;
 const isPhantomJS = UA && /phantomjs/.test(UA);
 const isFF = typeof UA == "string" && UA.match(/firefox\/(\d+)/);
 const isMobile = isBrowser && navigator.userAgent.toLowerCase().includes("mobile");
-
-const analyUnit = (size, unit = "px") => {
-  return lodash.isString(size) && /\D/g.test(size) ? size : size + unit;
-};
-const analySize = (size, unit) => {
-  if (typeof size === "string" || typeof size === "number") {
-    return { width: analyUnit(size, unit), height: analyUnit(size, unit) };
-  }
-  if (Array.isArray(size)) {
-    return { width: analyUnit(size[0], unit), height: analyUnit(size[1], unit) };
-  }
-  if (typeof size === "object") {
-    return { width: analyUnit(size.width, unit), height: analyUnit(size.height, unit) };
-  }
-  return { width: "", height: "" };
-};
-
-const checkedTypeof = (target) => {
-  return Object.prototype.toString.call(target).slice(8, -1);
-};
-const assert = (condition, ...infos) => {
-  if (!condition)
-    console.warn(...infos);
-  return condition;
-};
-const isClient = typeof window !== "undefined";
 const isFormData = (value) => lodash.isObject(value) && value instanceof FormData;
 const isWindow = (value) => typeof window !== "undefined" && toString.call(value) === "[object Window]";
 
-const urlParamsAnaly = (url, params) => {
-  const queryString = Object.keys(params).map((key) => `${key}=${params[key]}`);
-  if (queryString.length > 0)
-    url += "?" + queryString.join("&");
-  return url;
-};
-const awaitPromise = (code = 1e3) => {
-  return new Promise((resolve) => setTimeout(resolve, code));
+const formDataToObject = (formData) => {
+  return Object.fromEntries(formData.entries());
 };
-const generateArray = (start, end) => {
-  start = Number(start);
-  end = Number(end);
-  end = end > start ? end : start;
-  return [...new Array(end + 1).keys()].slice(start);
+const objectToFormData = (object) => {
+  const formData = new FormData();
+  for (const [key, value] of Object.entries(object)) {
+    formData.append(key, String(value));
+  }
+  return formData;
 };
 const pickByParams = (params, filters, deep = false) => {
   deep && lodash.forIn(params, (value, key) => {
@@ -149,16 +118,6 @@ const pickByParams = (params, filters, deep = false) => {
   }
   return pickValue;
 };
-const formDataToObject = (formData) => {
-  return Object.fromEntries(formData.entries());
-};
-const objectToFormData = (object) => {
-  const formData = new FormData();
-  for (const [key, value] of Object.entries(object)) {
-    formData.append(key, value);
-  }
-  return formData;
-};
 const objectFlat = (object, deep = 1) => {
   const flatDeep = (object2, deep2 = 1) => {
     let _object = {};
@@ -173,17 +132,61 @@ const objectFlat = (object, deep = 1) => {
   };
   return flatDeep(object, deep);
 };
+
+const analyUnit = (value, unit = "px") => {
+  const empty = !(lodash.isString(value) || lodash.isNumber(value));
+  if (empty)
+    return "";
+  return lodash.isString(value) && /\D/g.test(value) ? value : value + unit;
+};
+const analySize = (size, unit) => {
+  if (typeof size === "string" || typeof size === "number") {
+    return { width: analyUnit(size, unit), height: analyUnit(size, unit) };
+  }
+  if (Array.isArray(size)) {
+    return { width: analyUnit(size[0], unit), height: analyUnit(size[1], unit) };
+  }
+  if (typeof size === "object") {
+    return { width: analyUnit(size.width, unit), height: analyUnit(size.height, unit) };
+  }
+  return { width: "", height: "" };
+};
+
+const urlParamsAnaly = (url, params) => {
+  const queryString = Object.keys(params).map((key) => `${key}=${params[key]}`);
+  if (queryString.length > 0)
+    url += "?" + queryString.join("&");
+  return url;
+};
+const awaitPromise = (ms = 1e3) => {
+  return new Promise((resolve) => setTimeout(resolve, ms));
+};
+const generateArray = (start, end) => {
+  start = Number(start);
+  end = Number(end);
+  end = end > start ? end : start;
+  return [...new Array(end + 1).keys()].slice(start);
+};
 const noop = () => {
 };
+const checkedTypeof = (target) => {
+  const value = Object.prototype.toString.call(target).slice(8, -1).toLocaleLowerCase();
+  return value;
+};
+const assert = (condition, ...infos) => {
+  if (!condition)
+    console.warn(...infos);
+  return condition;
+};
 
 exports.UA = UA;
 exports.analySize = analySize;
 exports.analyUnit = analyUnit;
 exports.assert = assert;
 exports.awaitPromise = awaitPromise;
-exports.blendColor = blendColor;
 exports.capitalizeCamelCase = capitalizeCamelCase;
 exports.checkedTypeof = checkedTypeof;
+exports.colourBlend = colourBlend;
 exports.formDataToObject = formDataToObject;
 exports.formatClearHtml = formatClearHtml;
 exports.formatCoverPhone = formatCoverPhone;
@@ -197,7 +200,6 @@ exports.hexToRgba = hexToRgba;
 exports.isAndroid = isAndroid;
 exports.isBrowser = isBrowser;
 exports.isChrome = isChrome;
-exports.isClient = isClient;
 exports.isEdge = isEdge;
 exports.isFF = isFF;
 exports.isFormData = isFormData;

package/index.d.ts

@@ -1,13 +1,11 @@
-import { LooseNumber as LooseNumber$1 } from '@hairy/utils';
-
 /**
- * 颜色混合器
+ * 颜色混合器 - 仅支持 hex 颜色完整值
  * @param colorOne 颜色值
  * @param colorTwo 颜色值
  * @param ratio 根据 colorTwo 混合比例, 0~1 区间, 1 则是完全的 colorTwo
  * @returns 混合颜色
  */
-declare const blendColor: (colorOne: string, colorTwo: string, ratio: number) => string;
+declare const colourBlend: (colorOne: string, colorTwo: string, ratio: number) => string;
 /**
  * 将 hex 颜色转成 rgb
  * @param hex
@@ -25,18 +23,18 @@ declare const hexToRgba: (hex: string, opacity: number) => {
  * @param color
  */
 declare const fuseThemeColor: (color: string) => {
-    'primaryColorLight-2': string;
-    'primaryColorLight-4': string;
-    'primaryColorLight-6': string;
-    'primaryColorLight-8': string;
-    'primaryColorDark-2': string;
-    'primaryColorDark-4': string;
-    'primaryColorDark-6': string;
-    'primaryColorDark-8': string;
-    'primaryColorOpacity-2': string;
-    'primaryColorOpacity-4': string;
-    'primaryColorOpacity-6': string;
-    'primaryColorOpacity-8': string;
+    'light-2': string;
+    'light-4': string;
+    'light-6': string;
+    'light-8': string;
+    'dark-2': string;
+    'dark-4': string;
+    'dark-6': string;
+    'dark-8': string;
+    'opacity-2': string;
+    'opacity-4': string;
+    'opacity-6': string;
+    'opacity-8': string;
 };
 
 /**
@@ -70,10 +68,11 @@ declare const formatThousandBitSeparator: (target: number | string, unit?: strin
 declare const formatUnix: (timestamp: number, format?: string) => string;
 /**
  * 隐藏手机号中间四位
+ * @param phone 手机号
  */
 declare const formatCoverPhone: (phone: string) => string;
 /**
- * 数字位数不够，进行前补零
+ * 数字位数不够时，进行前补零
  * @param num 数值
  * @param lh 长度
  */
@@ -97,29 +96,32 @@ declare const isIOS: boolean;
 declare const isChrome: boolean | "";
 declare const isPhantomJS: boolean | "";
 declare const isFF: false | RegExpMatchArray | null;
-declare const isMobile: boolean;
+declare const isMobile: boolean;
+declare const isFormData: (value: any) => value is FormData;
+declare const isWindow: (value: any) => value is Window;
 
 /**
- * 如果有单位，如百分比，px单位等，直接返回，如果是纯粹的数值，则加上px单位
- * @param size 尺寸
- * @param unit 单元
- * @returns string
+ * 将 formData 转换为 object
+ * @param formData
  */
-declare const analyUnit: (size: LooseNumber$1, unit?: string) => string;
-/** size 转换配置 */
-declare type AnalySizeOption = LooseNumber$1 | [LooseNumber$1, LooseNumber$1] | {
-    width: LooseNumber$1;
-    height: LooseNumber$1;
-};
+declare const formDataToObject: (formData: FormData) => Record<string, string>;
 /**
- * 将 size 转换为宽高
- * @param size { AnalySizeOption }
- * @returns
+ * 将 object 转换为 formData
+ * @param object
  */
-declare const analySize: (size: AnalySizeOption, unit?: string | undefined) => {
-    width: string;
-    height: string;
-};
+declare const objectToFormData: (object: Record<string, string | number>) => FormData;
+/**
+ * 过滤对象|数组中 filters 中的值
+ * @param params
+ * @param filters
+ */
+declare const pickByParams: <T extends object>(params: T, filters: any[], deep?: boolean) => Partial<T>;
+/**
+ * 对象扁平化处理
+ * @param object 对象
+ * @param deep 深度
+ */
+declare const objectFlat: (object: Record<string, any>, deep?: number) => Record<string, any>;
 
 declare type PlainObject = {
     [key: string]: any;
@@ -148,20 +150,26 @@ declare type Option<L extends Key = 'label', V extends Key = 'value', C extends
 };
 
 /**
- * 获取数据类型
- * @param target 检测对象
- * @returns 返回字符串
+ * 如果有单位，如百分比，px单位等，直接返回，如果是纯粹的数值，则加上px单位
+ * @param size 尺寸
+ * @param unit 单元
+ * @returns string
  */
-declare const checkedTypeof: (target: any) => string;
+declare const analyUnit: (value: LooseNumber, unit?: string) => string;
+/** size 转换配置 */
+declare type AnalySizeOption = LooseNumber | [LooseNumber, LooseNumber] | {
+    width: LooseNumber;
+    height: LooseNumber;
+};
 /**
- * 不符合预期则弹出警告
- * @param condition
- * @param infos
+ * 将 size 转换为宽高
+ * @param size { AnalySizeOption }
+ * @returns
  */
-declare const assert: (condition: boolean, ...infos: any[]) => boolean;
-declare const isClient: boolean;
-declare const isFormData: (value: any) => value is FormData;
-declare const isWindow: (value: any) => value is Window;
+declare const analySize: (size: AnalySizeOption, unit?: string | undefined) => {
+    width: string;
+    height: string;
+};
 
 /**
  * 地址参数计算
@@ -174,7 +182,7 @@ declare const urlParamsAnaly: (url: string, params: Record<string, any>) => stri
  * 自定义 Promise 等待
  * @param code 等待时间
  */
-declare const awaitPromise: (code?: number) => Promise<unknown>;
+declare const awaitPromise: (ms?: number) => Promise<unknown>;
 /**
  * 生成递进的数组
  * @param start 开始数值
@@ -182,29 +190,19 @@ declare const awaitPromise: (code?: number) => Promise<unknown>;
  * @returns 递进的数组
  */
 declare const generateArray: (start: number, end: number) => number[];
+/** 空的方法 */
+declare const noop: () => void;
 /**
- * 根据过滤返回对应数据
- * @param params
- * @param filters
- */
-declare const pickByParams: <T extends object>(params: T, filters: any[], deep?: boolean) => Partial<T>;
-/**
- * 将 formData 转换为 ojbect
- * @param formData
- */
-declare const formDataToObject: (formData: FormData) => Record<string, string>;
-/**
- * 将 object 转换为 formData
- * @param object
+ * 获取数据类型
+ * @param target 检测对象
+ * @returns 返回字符串
  */
-declare const objectToFormData: (object: Record<string, string>) => FormData;
+declare const checkedTypeof: (target: any) => "string" | "number" | "bigint" | "boolean" | "symbol" | "undefined" | "object" | "function" | "null" | "regexp";
 /**
- * 对象扁平化处理
- * @param object 对象
- * @param deep 深度
+ * 不符合预期则弹出警告
+ * @param condition
+ * @param infos
  */
-declare const objectFlat: (object: Record<string, any>, deep?: number) => Record<string, any>;
-/** 空的方法 */
-declare const noop: () => void;
+declare const assert: (condition: boolean, ...infos: any[]) => boolean;
 
-export { AnalySizeOption, DeepKeyof, DeepPartial, DeepReadonly, DeepReplace, DeepRequired, Key, LooseNumber, Option, PlainObject, UA, analySize, analyUnit, assert, awaitPromise, blendColor, capitalizeCamelCase, checkedTypeof, formDataToObject, formatClearHtml, formatCoverPhone, formatInteger, formatPrice, formatThousandBitSeparator, formatUnix, fuseThemeColor, generateArray, hexToRgba, isAndroid, isBrowser, isChrome, isClient, isEdge, isFF, isFormData, isIE, isIE11, isIE9, isIOS, isMobile, isPhantomJS, isWeex, isWindow, noop, objectFlat, objectToFormData, pickByParams, prefixZero, urlParamsAnaly, weexPlatform };
+export { AnalySizeOption, DeepKeyof, DeepPartial, DeepReadonly, DeepReplace, DeepRequired, Key, LooseNumber, Option, PlainObject, UA, analySize, analyUnit, assert, awaitPromise, capitalizeCamelCase, checkedTypeof, colourBlend, formDataToObject, formatClearHtml, formatCoverPhone, formatInteger, formatPrice, formatThousandBitSeparator, formatUnix, fuseThemeColor, generateArray, hexToRgba, isAndroid, isBrowser, isChrome, isEdge, isFF, isFormData, isIE, isIE11, isIE9, isIOS, isMobile, isPhantomJS, isWeex, isWindow, noop, objectFlat, objectToFormData, pickByParams, prefixZero, urlParamsAnaly, weexPlatform };

package/index.esm.js

@@ -1,7 +1,7 @@
 import dayjs from 'dayjs';
-import { camelCase, isString, isObject, forIn, pickBy, isPlainObject } from 'lodash';
+import { camelCase, isObject, forIn, pickBy, isPlainObject, isString, isNumber } from 'lodash';
 
-const blendColor = (colorOne, colorTwo, ratio) => {
+const colourBlend = (colorOne, colorTwo, ratio) => {
   ratio = Math.max(Math.min(Number(ratio), 1), 0);
   const r1 = parseInt(colorOne.slice(1, 3), 16);
   const g1 = parseInt(colorOne.slice(3, 5), 16);
@@ -27,18 +27,18 @@ const hexToRgba = (hex, opacity) => {
   };
 };
 const fuseThemeColor = (color) => ({
-  "primaryColorLight-2": blendColor("#ffffff", color, 0.8),
-  "primaryColorLight-4": blendColor("#ffffff", color, 0.6),
-  "primaryColorLight-6": blendColor("#ffffff", color, 0.4),
-  "primaryColorLight-8": blendColor("#ffffff", color, 0.2),
-  "primaryColorDark-2": blendColor("#000000", color, 0.8),
-  "primaryColorDark-4": blendColor("#000000", color, 0.6),
-  "primaryColorDark-6": blendColor("#000000", color, 0.4),
-  "primaryColorDark-8": blendColor("#000000", color, 0.2),
-  "primaryColorOpacity-2": hexToRgba(color, 0.8).rgba,
-  "primaryColorOpacity-4": hexToRgba(color, 0.6).rgba,
-  "primaryColorOpacity-6": hexToRgba(color, 0.4).rgba,
-  "primaryColorOpacity-8": hexToRgba(color, 0.2).rgba
+  "light-2": colourBlend("#ffffff", color, 0.8),
+  "light-4": colourBlend("#ffffff", color, 0.6),
+  "light-6": colourBlend("#ffffff", color, 0.4),
+  "light-8": colourBlend("#ffffff", color, 0.2),
+  "dark-2": colourBlend("#000000", color, 0.8),
+  "dark-4": colourBlend("#000000", color, 0.6),
+  "dark-6": colourBlend("#000000", color, 0.4),
+  "dark-8": colourBlend("#000000", color, 0.2),
+  "opacity-2": hexToRgba(color, 0.8).rgba,
+  "opacity-4": hexToRgba(color, 0.6).rgba,
+  "opacity-6": hexToRgba(color, 0.4).rgba,
+  "opacity-8": hexToRgba(color, 0.2).rgba
 });
 
 const formatClearHtml = (string_) => string_.replace(/<[!/]*[^<>]*>/gi, "");
@@ -86,49 +86,18 @@ const isChrome = UA && /chrome\/\d+/.test(UA) && !isEdge;
 const isPhantomJS = UA && /phantomjs/.test(UA);
 const isFF = typeof UA == "string" && UA.match(/firefox\/(\d+)/);
 const isMobile = isBrowser && navigator.userAgent.toLowerCase().includes("mobile");
-
-const analyUnit = (size, unit = "px") => {
-  return isString(size) && /\D/g.test(size) ? size : size + unit;
-};
-const analySize = (size, unit) => {
-  if (typeof size === "string" || typeof size === "number") {
-    return { width: analyUnit(size, unit), height: analyUnit(size, unit) };
-  }
-  if (Array.isArray(size)) {
-    return { width: analyUnit(size[0], unit), height: analyUnit(size[1], unit) };
-  }
-  if (typeof size === "object") {
-    return { width: analyUnit(size.width, unit), height: analyUnit(size.height, unit) };
-  }
-  return { width: "", height: "" };
-};
-
-const checkedTypeof = (target) => {
-  return Object.prototype.toString.call(target).slice(8, -1);
-};
-const assert = (condition, ...infos) => {
-  if (!condition)
-    console.warn(...infos);
-  return condition;
-};
-const isClient = typeof window !== "undefined";
 const isFormData = (value) => isObject(value) && value instanceof FormData;
 const isWindow = (value) => typeof window !== "undefined" && toString.call(value) === "[object Window]";
 
-const urlParamsAnaly = (url, params) => {
-  const queryString = Object.keys(params).map((key) => `${key}=${params[key]}`);
-  if (queryString.length > 0)
-    url += "?" + queryString.join("&");
-  return url;
-};
-const awaitPromise = (code = 1e3) => {
-  return new Promise((resolve) => setTimeout(resolve, code));
+const formDataToObject = (formData) => {
+  return Object.fromEntries(formData.entries());
 };
-const generateArray = (start, end) => {
-  start = Number(start);
-  end = Number(end);
-  end = end > start ? end : start;
-  return [...new Array(end + 1).keys()].slice(start);
+const objectToFormData = (object) => {
+  const formData = new FormData();
+  for (const [key, value] of Object.entries(object)) {
+    formData.append(key, String(value));
+  }
+  return formData;
 };
 const pickByParams = (params, filters, deep = false) => {
   deep && forIn(params, (value, key) => {
@@ -141,16 +110,6 @@ const pickByParams = (params, filters, deep = false) => {
   }
   return pickValue;
 };
-const formDataToObject = (formData) => {
-  return Object.fromEntries(formData.entries());
-};
-const objectToFormData = (object) => {
-  const formData = new FormData();
-  for (const [key, value] of Object.entries(object)) {
-    formData.append(key, value);
-  }
-  return formData;
-};
 const objectFlat = (object, deep = 1) => {
   const flatDeep = (object2, deep2 = 1) => {
     let _object = {};
@@ -165,7 +124,51 @@ const objectFlat = (object, deep = 1) => {
   };
   return flatDeep(object, deep);
 };
+
+const analyUnit = (value, unit = "px") => {
+  const empty = !(isString(value) || isNumber(value));
+  if (empty)
+    return "";
+  return isString(value) && /\D/g.test(value) ? value : value + unit;
+};
+const analySize = (size, unit) => {
+  if (typeof size === "string" || typeof size === "number") {
+    return { width: analyUnit(size, unit), height: analyUnit(size, unit) };
+  }
+  if (Array.isArray(size)) {
+    return { width: analyUnit(size[0], unit), height: analyUnit(size[1], unit) };
+  }
+  if (typeof size === "object") {
+    return { width: analyUnit(size.width, unit), height: analyUnit(size.height, unit) };
+  }
+  return { width: "", height: "" };
+};
+
+const urlParamsAnaly = (url, params) => {
+  const queryString = Object.keys(params).map((key) => `${key}=${params[key]}`);
+  if (queryString.length > 0)
+    url += "?" + queryString.join("&");
+  return url;
+};
+const awaitPromise = (ms = 1e3) => {
+  return new Promise((resolve) => setTimeout(resolve, ms));
+};
+const generateArray = (start, end) => {
+  start = Number(start);
+  end = Number(end);
+  end = end > start ? end : start;
+  return [...new Array(end + 1).keys()].slice(start);
+};
 const noop = () => {
 };
+const checkedTypeof = (target) => {
+  const value = Object.prototype.toString.call(target).slice(8, -1).toLocaleLowerCase();
+  return value;
+};
+const assert = (condition, ...infos) => {
+  if (!condition)
+    console.warn(...infos);
+  return condition;
+};
 
-export { UA, analySize, analyUnit, assert, awaitPromise, blendColor, capitalizeCamelCase, checkedTypeof, formDataToObject, formatClearHtml, formatCoverPhone, formatInteger, formatPrice, formatThousandBitSeparator, formatUnix, fuseThemeColor, generateArray, hexToRgba, isAndroid, isBrowser, isChrome, isClient, isEdge, isFF, isFormData, isIE, isIE11, isIE9, isIOS, isMobile, isPhantomJS, isWeex, isWindow, noop, objectFlat, objectToFormData, pickByParams, prefixZero, urlParamsAnaly, weexPlatform };
+export { UA, analySize, analyUnit, assert, awaitPromise, capitalizeCamelCase, checkedTypeof, colourBlend, formDataToObject, formatClearHtml, formatCoverPhone, formatInteger, formatPrice, formatThousandBitSeparator, formatUnix, fuseThemeColor, generateArray, hexToRgba, isAndroid, isBrowser, isChrome, isEdge, isFF, isFormData, isIE, isIE11, isIE9, isIOS, isMobile, isPhantomJS, isWeex, isWindow, noop, objectFlat, objectToFormData, pickByParams, prefixZero, urlParamsAnaly, weexPlatform };

package/index.iife.js

@@ -5,7 +5,7 @@
 
   var dayjs__default = /*#__PURE__*/_interopDefaultLegacy(dayjs);
 
-  const blendColor = (colorOne, colorTwo, ratio) => {
+  const colourBlend = (colorOne, colorTwo, ratio) => {
     ratio = Math.max(Math.min(Number(ratio), 1), 0);
     const r1 = parseInt(colorOne.slice(1, 3), 16);
     const g1 = parseInt(colorOne.slice(3, 5), 16);
@@ -31,18 +31,18 @@
     };
   };
   const fuseThemeColor = (color) => ({
-    "primaryColorLight-2": blendColor("#ffffff", color, 0.8),
-    "primaryColorLight-4": blendColor("#ffffff", color, 0.6),
-    "primaryColorLight-6": blendColor("#ffffff", color, 0.4),
-    "primaryColorLight-8": blendColor("#ffffff", color, 0.2),
-    "primaryColorDark-2": blendColor("#000000", color, 0.8),
-    "primaryColorDark-4": blendColor("#000000", color, 0.6),
-    "primaryColorDark-6": blendColor("#000000", color, 0.4),
-    "primaryColorDark-8": blendColor("#000000", color, 0.2),
-    "primaryColorOpacity-2": hexToRgba(color, 0.8).rgba,
-    "primaryColorOpacity-4": hexToRgba(color, 0.6).rgba,
-    "primaryColorOpacity-6": hexToRgba(color, 0.4).rgba,
-    "primaryColorOpacity-8": hexToRgba(color, 0.2).rgba
+    "light-2": colourBlend("#ffffff", color, 0.8),
+    "light-4": colourBlend("#ffffff", color, 0.6),
+    "light-6": colourBlend("#ffffff", color, 0.4),
+    "light-8": colourBlend("#ffffff", color, 0.2),
+    "dark-2": colourBlend("#000000", color, 0.8),
+    "dark-4": colourBlend("#000000", color, 0.6),
+    "dark-6": colourBlend("#000000", color, 0.4),
+    "dark-8": colourBlend("#000000", color, 0.2),
+    "opacity-2": hexToRgba(color, 0.8).rgba,
+    "opacity-4": hexToRgba(color, 0.6).rgba,
+    "opacity-6": hexToRgba(color, 0.4).rgba,
+    "opacity-8": hexToRgba(color, 0.2).rgba
   });
 
   const formatClearHtml = (string_) => string_.replace(/<[!/]*[^<>]*>/gi, "");
@@ -90,49 +90,18 @@
   const isPhantomJS = UA && /phantomjs/.test(UA);
   const isFF = typeof UA == "string" && UA.match(/firefox\/(\d+)/);
   const isMobile = isBrowser && navigator.userAgent.toLowerCase().includes("mobile");
-
-  const analyUnit = (size, unit = "px") => {
-    return lodash.isString(size) && /\D/g.test(size) ? size : size + unit;
-  };
-  const analySize = (size, unit) => {
-    if (typeof size === "string" || typeof size === "number") {
-      return { width: analyUnit(size, unit), height: analyUnit(size, unit) };
-    }
-    if (Array.isArray(size)) {
-      return { width: analyUnit(size[0], unit), height: analyUnit(size[1], unit) };
-    }
-    if (typeof size === "object") {
-      return { width: analyUnit(size.width, unit), height: analyUnit(size.height, unit) };
-    }
-    return { width: "", height: "" };
-  };
-
-  const checkedTypeof = (target) => {
-    return Object.prototype.toString.call(target).slice(8, -1);
-  };
-  const assert = (condition, ...infos) => {
-    if (!condition)
-      console.warn(...infos);
-    return condition;
-  };
-  const isClient = typeof window !== "undefined";
   const isFormData = (value) => lodash.isObject(value) && value instanceof FormData;
   const isWindow = (value) => typeof window !== "undefined" && toString.call(value) === "[object Window]";
 
-  const urlParamsAnaly = (url, params) => {
-    const queryString = Object.keys(params).map((key) => `${key}=${params[key]}`);
-    if (queryString.length > 0)
-      url += "?" + queryString.join("&");
-    return url;
-  };
-  const awaitPromise = (code = 1e3) => {
-    return new Promise((resolve) => setTimeout(resolve, code));
+  const formDataToObject = (formData) => {
+    return Object.fromEntries(formData.entries());
   };
-  const generateArray = (start, end) => {
-    start = Number(start);
-    end = Number(end);
-    end = end > start ? end : start;
-    return [...new Array(end + 1).keys()].slice(start);
+  const objectToFormData = (object) => {
+    const formData = new FormData();
+    for (const [key, value] of Object.entries(object)) {
+      formData.append(key, String(value));
+    }
+    return formData;
   };
   const pickByParams = (params, filters, deep = false) => {
     deep && lodash.forIn(params, (value, key) => {
@@ -145,16 +114,6 @@
     }
     return pickValue;
   };
-  const formDataToObject = (formData) => {
-    return Object.fromEntries(formData.entries());
-  };
-  const objectToFormData = (object) => {
-    const formData = new FormData();
-    for (const [key, value] of Object.entries(object)) {
-      formData.append(key, value);
-    }
-    return formData;
-  };
   const objectFlat = (object, deep = 1) => {
     const flatDeep = (object2, deep2 = 1) => {
       let _object = {};
@@ -169,17 +128,61 @@
     };
     return flatDeep(object, deep);
   };
+
+  const analyUnit = (value, unit = "px") => {
+    const empty = !(lodash.isString(value) || lodash.isNumber(value));
+    if (empty)
+      return "";
+    return lodash.isString(value) && /\D/g.test(value) ? value : value + unit;
+  };
+  const analySize = (size, unit) => {
+    if (typeof size === "string" || typeof size === "number") {
+      return { width: analyUnit(size, unit), height: analyUnit(size, unit) };
+    }
+    if (Array.isArray(size)) {
+      return { width: analyUnit(size[0], unit), height: analyUnit(size[1], unit) };
+    }
+    if (typeof size === "object") {
+      return { width: analyUnit(size.width, unit), height: analyUnit(size.height, unit) };
+    }
+    return { width: "", height: "" };
+  };
+
+  const urlParamsAnaly = (url, params) => {
+    const queryString = Object.keys(params).map((key) => `${key}=${params[key]}`);
+    if (queryString.length > 0)
+      url += "?" + queryString.join("&");
+    return url;
+  };
+  const awaitPromise = (ms = 1e3) => {
+    return new Promise((resolve) => setTimeout(resolve, ms));
+  };
+  const generateArray = (start, end) => {
+    start = Number(start);
+    end = Number(end);
+    end = end > start ? end : start;
+    return [...new Array(end + 1).keys()].slice(start);
+  };
   const noop = () => {
   };
+  const checkedTypeof = (target) => {
+    const value = Object.prototype.toString.call(target).slice(8, -1).toLocaleLowerCase();
+    return value;
+  };
+  const assert = (condition, ...infos) => {
+    if (!condition)
+      console.warn(...infos);
+    return condition;
+  };
 
   exports.UA = UA;
   exports.analySize = analySize;
   exports.analyUnit = analyUnit;
   exports.assert = assert;
   exports.awaitPromise = awaitPromise;
-  exports.blendColor = blendColor;
   exports.capitalizeCamelCase = capitalizeCamelCase;
   exports.checkedTypeof = checkedTypeof;
+  exports.colourBlend = colourBlend;
   exports.formDataToObject = formDataToObject;
   exports.formatClearHtml = formatClearHtml;
   exports.formatCoverPhone = formatCoverPhone;
@@ -193,7 +196,6 @@
   exports.isAndroid = isAndroid;
   exports.isBrowser = isBrowser;
   exports.isChrome = isChrome;
-  exports.isClient = isClient;
   exports.isEdge = isEdge;
   exports.isFF = isFF;
   exports.isFormData = isFormData;

package/index.iife.min.js

@@ -1 +1 @@
-!function(e,r,t){"use strict";function i(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}var o=i(r);const a=(e,r,t)=>{t=Math.max(Math.min(Number(t),1),0);const i=parseInt(e.slice(1,3),16),o=parseInt(e.slice(3,5),16),a=parseInt(e.slice(5,7),16),n=parseInt(r.slice(1,3),16),s=parseInt(r.slice(3,5),16),l=parseInt(r.slice(5,7),16);let c=Math.round(i*(1-t)+n*t),p=Math.round(o*(1-t)+s*t),f=Math.round(a*(1-t)+l*t);return c=("0"+(c||0).toString(16)).slice(-2),p=("0"+(p||0).toString(16)).slice(-2),f=("0"+(f||0).toString(16)).slice(-2),"#"+c+p+f},n=(e,r)=>{const t="rgba("+parseInt("0x"+e.slice(1,3))+","+parseInt("0x"+e.slice(3,5))+","+parseInt("0x"+e.slice(5,7))+","+r+")";return{red:parseInt("0x"+e.slice(1,3)),green:parseInt("0x"+e.slice(3,5)),blue:parseInt("0x"+e.slice(5,7)),rgba:t}},s="undefined"!=typeof window,l="undefined"!=typeof WXEnvironment&&!!WXEnvironment.platform,c=l&&WXEnvironment.platform.toLowerCase(),p=s&&window.navigator.userAgent.toLowerCase(),f=p&&/msie|trident/.test(p),d=p&&p.indexOf("msie 9.0")>0,m=s&&navigator.userAgent.includes("Trident")&&navigator.userAgent.includes("rv:11.0"),g=p&&p.indexOf("edge/")>0,u=p&&p.indexOf("android")>0||"android"===c,y=p&&/iphone|ipad|ipod|ios/.test(p)||"ios"===c,h=p&&/chrome\/\d+/.test(p)&&!g,b=p&&/phantomjs/.test(p),w="string"==typeof p&&p.match(/firefox\/(\d+)/),C=s&&navigator.userAgent.toLowerCase().includes("mobile"),j=(e,r="px")=>t.isString(e)&&/\D/g.test(e)?e:e+r,x="undefined"!=typeof window,O=(e,r,i=!1)=>{i&&t.forIn(e,((o,a)=>{t.isObject(o)&&(e[a]=O(e[a],r,i))}));const o=t.pickBy(e,(e=>!r.includes(e)));return Array.isArray(e)?Object.values(o):o};e.UA=p,e.analySize=(e,r)=>"string"==typeof e||"number"==typeof e?{width:j(e,r),height:j(e,r)}:Array.isArray(e)?{width:j(e[0],r),height:j(e[1],r)}:"object"==typeof e?{width:j(e.width,r),height:j(e.height,r)}:{width:"",height:""},e.analyUnit=j,e.assert=(e,...r)=>(e||console.warn(...r),e),e.awaitPromise=(e=1e3)=>new Promise((r=>setTimeout(r,e))),e.blendColor=a,e.capitalizeCamelCase=e=>{let r=t.camelCase(e);return r=r.slice(0,1).toLocaleUpperCase()+r.slice(1),r},e.checkedTypeof=e=>Object.prototype.toString.call(e).slice(8,-1),e.formDataToObject=e=>Object.fromEntries(e.entries()),e.formatClearHtml=e=>e.replace(/<[!/]*[^<>]*>/gi,""),e.formatCoverPhone=e=>e.replace(/^(\d{3})\d{4}(\d{4})$/,"$1****$2"),e.formatInteger=e=>e.replace(/^(0+)|\D+/g,""),e.formatPrice=e=>e.replace(/^[^\d+]/,"").replace(/[^\d,.{|}]/g,"").replace(".","$#$").replace(/\./g,"").replace("$#$",".").replace(/\.{2,}/g,".").replace(/^(-)*(\d+)\.(\d\d).*$/,"$1$2.$3"),e.formatThousandBitSeparator=(e,r=",")=>{if(""===e)return"";const t=String(e).split(".");for(let e=0;e<t.length;e++)t[e]=t[e].replace(new RegExp("(\\d)(?=(\\d{3})+$)","ig"),`$1${r||""}`);return t.join(".")},e.formatUnix=(e,r="YYYY-MM-DD HH:mm:ss")=>o.default.unix(e).format(r),e.fuseThemeColor=e=>({"primaryColorLight-2":a("#ffffff",e,.8),"primaryColorLight-4":a("#ffffff",e,.6),"primaryColorLight-6":a("#ffffff",e,.4),"primaryColorLight-8":a("#ffffff",e,.2),"primaryColorDark-2":a("#000000",e,.8),"primaryColorDark-4":a("#000000",e,.6),"primaryColorDark-6":a("#000000",e,.4),"primaryColorDark-8":a("#000000",e,.2),"primaryColorOpacity-2":n(e,.8).rgba,"primaryColorOpacity-4":n(e,.6).rgba,"primaryColorOpacity-6":n(e,.4).rgba,"primaryColorOpacity-8":n(e,.2).rgba}),e.generateArray=(e,r)=>(e=Number(e),r=(r=Number(r))>e?r:e,[...new Array(r+1).keys()].slice(e)),e.hexToRgba=n,e.isAndroid=u,e.isBrowser=s,e.isChrome=h,e.isClient=x,e.isEdge=g,e.isFF=w,e.isFormData=e=>t.isObject(e)&&e instanceof FormData,e.isIE=f,e.isIE11=m,e.isIE9=d,e.isIOS=y,e.isMobile=C,e.isPhantomJS=b,e.isWeex=l,e.isWindow=e=>"undefined"!=typeof window&&"[object Window]"===toString.call(e),e.noop=()=>{},e.objectFlat=(e,r=1)=>{const i=(e,r=1)=>{let o={};for(const[a,n]of Object.entries(e))t.isPlainObject(n)?o={...o,...r>0?i(n,r-1):n}:o[a]=n;return o};return i(e,r)},e.objectToFormData=e=>{const r=new FormData;for(const[t,i]of Object.entries(e))r.append(t,i);return r},e.pickByParams=O,e.prefixZero=(e,r=2)=>(new Array(r).join("0")+e).slice(-r),e.urlParamsAnaly=(e,r)=>{const t=Object.keys(r).map((e=>`${e}=${r[e]}`));return t.length>0&&(e+="?"+t.join("&")),e},e.weexPlatform=c,Object.defineProperty(e,"__esModule",{value:!0})}(this.hairyUtils=this.hairyUtils||{},dayjs,_);
+!function(e,t,r){"use strict";function i(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}var a=i(t);const n=(e,t,r)=>{r=Math.max(Math.min(Number(r),1),0);const i=parseInt(e.slice(1,3),16),a=parseInt(e.slice(3,5),16),n=parseInt(e.slice(5,7),16),o=parseInt(t.slice(1,3),16),s=parseInt(t.slice(3,5),16),c=parseInt(t.slice(5,7),16);let l=Math.round(i*(1-r)+o*r),f=Math.round(a*(1-r)+s*r),d=Math.round(n*(1-r)+c*r);return l=("0"+(l||0).toString(16)).slice(-2),f=("0"+(f||0).toString(16)).slice(-2),d=("0"+(d||0).toString(16)).slice(-2),"#"+l+f+d},o=(e,t)=>{const r="rgba("+parseInt("0x"+e.slice(1,3))+","+parseInt("0x"+e.slice(3,5))+","+parseInt("0x"+e.slice(5,7))+","+t+")";return{red:parseInt("0x"+e.slice(1,3)),green:parseInt("0x"+e.slice(3,5)),blue:parseInt("0x"+e.slice(5,7)),rgba:r}},s="undefined"!=typeof window,c="undefined"!=typeof WXEnvironment&&!!WXEnvironment.platform,l=c&&WXEnvironment.platform.toLowerCase(),f=s&&window.navigator.userAgent.toLowerCase(),d=f&&/msie|trident/.test(f),p=f&&f.indexOf("msie 9.0")>0,g=s&&navigator.userAgent.includes("Trident")&&navigator.userAgent.includes("rv:11.0"),m=f&&f.indexOf("edge/")>0,u=f&&f.indexOf("android")>0||"android"===l,h=f&&/iphone|ipad|ipod|ios/.test(f)||"ios"===l,y=f&&/chrome\/\d+/.test(f)&&!m,b=f&&/phantomjs/.test(f),w="string"==typeof f&&f.match(/firefox\/(\d+)/),j=s&&navigator.userAgent.toLowerCase().includes("mobile"),x=(e,t,i=!1)=>{i&&r.forIn(e,((a,n)=>{r.isObject(a)&&(e[n]=x(e[n],t,i))}));const a=r.pickBy(e,(e=>!t.includes(e)));return Array.isArray(e)?Object.values(a):a},I=(e,t="px")=>!(r.isString(e)||r.isNumber(e))?"":r.isString(e)&&/\D/g.test(e)?e:e+t;e.UA=f,e.analySize=(e,t)=>"string"==typeof e||"number"==typeof e?{width:I(e,t),height:I(e,t)}:Array.isArray(e)?{width:I(e[0],t),height:I(e[1],t)}:"object"==typeof e?{width:I(e.width,t),height:I(e.height,t)}:{width:"",height:""},e.analyUnit=I,e.assert=(e,...t)=>(e||console.warn(...t),e),e.awaitPromise=(e=1e3)=>new Promise((t=>setTimeout(t,e))),e.capitalizeCamelCase=e=>{let t=r.camelCase(e);return t=t.slice(0,1).toLocaleUpperCase()+t.slice(1),t},e.checkedTypeof=e=>Object.prototype.toString.call(e).slice(8,-1).toLocaleLowerCase(),e.colourBlend=n,e.formDataToObject=e=>Object.fromEntries(e.entries()),e.formatClearHtml=e=>e.replace(/<[!/]*[^<>]*>/gi,""),e.formatCoverPhone=e=>e.replace(/^(\d{3})\d{4}(\d{4})$/,"$1****$2"),e.formatInteger=e=>e.replace(/^(0+)|\D+/g,""),e.formatPrice=e=>e.replace(/^[^\d+]/,"").replace(/[^\d,.{|}]/g,"").replace(".","$#$").replace(/\./g,"").replace("$#$",".").replace(/\.{2,}/g,".").replace(/^(-)*(\d+)\.(\d\d).*$/,"$1$2.$3"),e.formatThousandBitSeparator=(e,t=",")=>{if(""===e)return"";const r=String(e).split(".");for(let e=0;e<r.length;e++)r[e]=r[e].replace(new RegExp("(\\d)(?=(\\d{3})+$)","ig"),`$1${t||""}`);return r.join(".")},e.formatUnix=(e,t="YYYY-MM-DD HH:mm:ss")=>a.default.unix(e).format(t),e.fuseThemeColor=e=>({"light-2":n("#ffffff",e,.8),"light-4":n("#ffffff",e,.6),"light-6":n("#ffffff",e,.4),"light-8":n("#ffffff",e,.2),"dark-2":n("#000000",e,.8),"dark-4":n("#000000",e,.6),"dark-6":n("#000000",e,.4),"dark-8":n("#000000",e,.2),"opacity-2":o(e,.8).rgba,"opacity-4":o(e,.6).rgba,"opacity-6":o(e,.4).rgba,"opacity-8":o(e,.2).rgba}),e.generateArray=(e,t)=>(e=Number(e),t=(t=Number(t))>e?t:e,[...new Array(t+1).keys()].slice(e)),e.hexToRgba=o,e.isAndroid=u,e.isBrowser=s,e.isChrome=y,e.isEdge=m,e.isFF=w,e.isFormData=e=>r.isObject(e)&&e instanceof FormData,e.isIE=d,e.isIE11=g,e.isIE9=p,e.isIOS=h,e.isMobile=j,e.isPhantomJS=b,e.isWeex=c,e.isWindow=e=>"undefined"!=typeof window&&"[object Window]"===toString.call(e),e.noop=()=>{},e.objectFlat=(e,t=1)=>{const i=(e,t=1)=>{let a={};for(const[n,o]of Object.entries(e))r.isPlainObject(o)?a={...a,...t>0?i(o,t-1):o}:a[n]=o;return a};return i(e,t)},e.objectToFormData=e=>{const t=new FormData;for(const[r,i]of Object.entries(e))t.append(r,String(i));return t},e.pickByParams=x,e.prefixZero=(e,t=2)=>(new Array(t).join("0")+e).slice(-t),e.urlParamsAnaly=(e,t)=>{const r=Object.keys(t).map((e=>`${e}=${t[e]}`));return r.length>0&&(e+="?"+r.join("&")),e},e.weexPlatform=l,Object.defineProperty(e,"__esModule",{value:!0})}(this.hairyUtils=this.hairyUtils||{},dayjs,_);

package/package.json

@@ -1,14 +1,16 @@
 {
   "name": "@hairy/utils",
-  "version": "1.0.16",
+  "version": "1.0.17",
   "license": "MIT",
   "dependencies": {
-    "dayjs": "^1.10.6",
-    "lodash": "^4.17.21"
+    "dayjs": "^1.10.6"
   },
   "devDependencies": {
     "@types/lodash": "^4.14.171"
   },
+  "peerDependencies": {
+    "lodash": "^4.17.21"
+  },
   "main": "./index.cjs.js",
   "types": "./index.d.ts",
   "module": "./index.esm.js",
@@ -31,7 +33,7 @@
     },
     "./*": "./*"
   },
-  "gitHead": "3bdb75dc5cd49def822404c98aac6d64bec825eb",
+  "gitHead": "bca71be627bca344863814aa00ac4593a2e3f195",
   "publishConfig": {
     "access": "public"
   }