@deot/helper-utils 1.0.1 → 1.0.2

package/README.md

@@ -24,7 +24,6 @@ import { Utils } from '@deot/helper';
 | [getPropByPath][./src/get-prop-by-path.ts]                         | 根据路径找值            |
 | [getUid][./src/get-uid.ts]                                         | 生成唯一id            |
 | [hasOwn][./src/has-own.ts]                                         | 是否在原型上            |
-| [isObj][./src/is-obj.ts]                                           | 是否对象              |
 | [numberToUnit][./src/number-to-unit.ts]                            | 大数据转成中文单位         |
 | [preZero][./src/pre-zero.ts]                                       | 加零                |
 | [raf][./src/raf.ts]                                                | raf               |

package/dist/index.cjs.js

@@ -150,7 +150,7 @@ const debounce = (original, wait, options) => {
 };
 
 const def = (target, key, value, options) => {
-  Object.defineProperty(target, key, {
+  return Object.defineProperty(target, key, {
     value,
     enumerable: false,
     writable: true,
@@ -192,8 +192,6 @@ const getUid = (prefix) => {
 
 const hasOwn = (target, key) => Object.prototype.hasOwnProperty.call(target, key);
 
-const isObj = (target) => typeof target === "object";
-
 const getDigit = (integer) => {
   let digit = -1;
   while (integer >= 1) {
@@ -295,7 +293,7 @@ const throttle = (original, wait, options) => {
   );
 };
 
-const flattenDecodeURIComponent = (value) => {
+const flatten = (value, parser) => {
   let need = true;
   let safeCount = 1;
   let parseValue = value;
@@ -304,7 +302,7 @@ const flattenDecodeURIComponent = (value) => {
       throw new Error(value);
     }
     try {
-      let next = decodeURIComponent(parseValue);
+      let next = (parser || decodeURIComponent)(parseValue);
       if (parseValue === next) {
         need = false;
       }
@@ -324,25 +322,7 @@ const flattenJSONParse = (value) => {
   if (regex.test(value) && value.length >= 16 && +value > Number.MAX_SAFE_INTEGER) {
     return value;
   }
-  let need = true;
-  let safeCount = 1;
-  let parseValue = value;
-  while (need) {
-    if (safeCount > 10) {
-      throw new Error(value);
-    }
-    try {
-      let next = JSON.parse(parseValue);
-      if (parseValue === next) {
-        need = false;
-      }
-      parseValue = next;
-    } catch {
-      need = false;
-    }
-    safeCount++;
-  }
-  return parseValue;
+  return flatten(value, JSON.parse);
 };
 
 exports.asterisk = asterisk;
@@ -353,12 +333,11 @@ exports.compressImage = compressImage;
 exports.dataURLToFile = dataURLToFile;
 exports.debounce = debounce;
 exports.def = def;
-exports.flattenDecodeURIComponent = flattenDecodeURIComponent;
+exports.flatten = flatten;
 exports.flattenJSONParse = flattenJSONParse;
 exports.getPropByPath = getPropByPath;
 exports.getUid = getUid;
 exports.hasOwn = hasOwn;
-exports.isObj = isObj;
 exports.numberToUnit = numberToUnit;
 exports.preZero = preZero;
 exports.probs = probs;

package/dist/index.d.ts

@@ -8,12 +8,12 @@ export declare const canvasToImage: (canvas: HTMLCanvasElement, filename?: strin
 
 export declare const cloneDeepEasier: (source: object) => any;
 
-export declare const compressImage: (file: File, options?: CompressOptions) => Promise<{
+export declare const compressImage: (file: File, options?: CompressImageOptions) => Promise<{
     dataURL: string;
     file: File;
 }>;
 
-export declare interface CompressOptions {
+export declare interface CompressImageOptions {
     width?: number;
     height?: number;
     filetype?: string;
@@ -28,9 +28,9 @@ export declare const debounce: (original: Function, wait?: number, options?: Opt
     flush(): void;
 };
 
-export declare const def: (target: object, key: PropertyKey, value?: any, options?: PropertyDescriptor) => void;
+export declare const def: <T = object>(target: T, key: PropertyKey, value?: any, options?: PropertyDescriptor) => T;
 
-export declare const flattenDecodeURIComponent: (value: string) => string;
+export declare const flatten: (value: any, parser?: ((x: any) => any) | undefined) => any;
 
 export declare const flattenJSONParse: (value: string | null) => any;
 
@@ -40,8 +40,6 @@ export declare const getUid: (prefix?: string) => string;
 
 export declare const hasOwn: (target: object, key: PropertyKey) => boolean;
 
-export declare const isObj: (target?: any) => boolean;
-
 export declare const numberToUnit: (number: number, decimalDigit?: number) => string | number;
 
 declare interface ObjectKeyValue {

package/dist/index.es.js

@@ -146,7 +146,7 @@ const debounce = (original, wait, options) => {
 };
 
 const def = (target, key, value, options) => {
-  Object.defineProperty(target, key, {
+  return Object.defineProperty(target, key, {
     value,
     enumerable: false,
     writable: true,
@@ -188,8 +188,6 @@ const getUid = (prefix) => {
 
 const hasOwn = (target, key) => Object.prototype.hasOwnProperty.call(target, key);
 
-const isObj = (target) => typeof target === "object";
-
 const getDigit = (integer) => {
   let digit = -1;
   while (integer >= 1) {
@@ -291,7 +289,7 @@ const throttle = (original, wait, options) => {
   );
 };
 
-const flattenDecodeURIComponent = (value) => {
+const flatten = (value, parser) => {
   let need = true;
   let safeCount = 1;
   let parseValue = value;
@@ -300,7 +298,7 @@ const flattenDecodeURIComponent = (value) => {
       throw new Error(value);
     }
     try {
-      let next = decodeURIComponent(parseValue);
+      let next = (parser || decodeURIComponent)(parseValue);
       if (parseValue === next) {
         need = false;
       }
@@ -320,25 +318,7 @@ const flattenJSONParse = (value) => {
   if (regex.test(value) && value.length >= 16 && +value > Number.MAX_SAFE_INTEGER) {
     return value;
   }
-  let need = true;
-  let safeCount = 1;
-  let parseValue = value;
-  while (need) {
-    if (safeCount > 10) {
-      throw new Error(value);
-    }
-    try {
-      let next = JSON.parse(parseValue);
-      if (parseValue === next) {
-        need = false;
-      }
-      parseValue = next;
-    } catch {
-      need = false;
-    }
-    safeCount++;
-  }
-  return parseValue;
+  return flatten(value, JSON.parse);
 };
 
-export { asterisk, autoCatch, canvasToImage, cloneDeepEasier, compressImage, dataURLToFile, debounce, def, flattenDecodeURIComponent, flattenJSONParse, getPropByPath, getUid, hasOwn, isObj, numberToUnit, preZero, probs, raf, range, sleep, throttle };
+export { asterisk, autoCatch, canvasToImage, cloneDeepEasier, compressImage, dataURLToFile, debounce, def, flatten, flattenJSONParse, getPropByPath, getUid, hasOwn, numberToUnit, preZero, probs, raf, range, sleep, throttle };

package/dist/index.iife.js

@@ -149,7 +149,7 @@ var HelperUtils = (function (exports) {
 	};
 
 	const def = (target, key, value, options) => {
-	  Object.defineProperty(target, key, {
+	  return Object.defineProperty(target, key, {
 	    value,
 	    enumerable: false,
 	    writable: true,
@@ -191,8 +191,6 @@ var HelperUtils = (function (exports) {
 
 	const hasOwn = (target, key) => Object.prototype.hasOwnProperty.call(target, key);
 
-	const isObj = (target) => typeof target === "object";
-
 	const getDigit = (integer) => {
 	  let digit = -1;
 	  while (integer >= 1) {
@@ -294,7 +292,7 @@ var HelperUtils = (function (exports) {
 	  );
 	};
 
-	const flattenDecodeURIComponent = (value) => {
+	const flatten = (value, parser) => {
 	  let need = true;
 	  let safeCount = 1;
 	  let parseValue = value;
@@ -303,7 +301,7 @@ var HelperUtils = (function (exports) {
 	      throw new Error(value);
 	    }
 	    try {
-	      let next = decodeURIComponent(parseValue);
+	      let next = (parser || decodeURIComponent)(parseValue);
 	      if (parseValue === next) {
 	        need = false;
 	      }
@@ -323,25 +321,7 @@ var HelperUtils = (function (exports) {
 	  if (regex.test(value) && value.length >= 16 && +value > Number.MAX_SAFE_INTEGER) {
 	    return value;
 	  }
-	  let need = true;
-	  let safeCount = 1;
-	  let parseValue = value;
-	  while (need) {
-	    if (safeCount > 10) {
-	      throw new Error(value);
-	    }
-	    try {
-	      let next = JSON.parse(parseValue);
-	      if (parseValue === next) {
-	        need = false;
-	      }
-	      parseValue = next;
-	    } catch {
-	      need = false;
-	    }
-	    safeCount++;
-	  }
-	  return parseValue;
+	  return flatten(value, JSON.parse);
 	};
 
 	exports.asterisk = asterisk;
@@ -352,12 +332,11 @@ var HelperUtils = (function (exports) {
 	exports.dataURLToFile = dataURLToFile;
 	exports.debounce = debounce;
 	exports.def = def;
-	exports.flattenDecodeURIComponent = flattenDecodeURIComponent;
+	exports.flatten = flatten;
 	exports.flattenJSONParse = flattenJSONParse;
 	exports.getPropByPath = getPropByPath;
 	exports.getUid = getUid;
 	exports.hasOwn = hasOwn;
-	exports.isObj = isObj;
 	exports.numberToUnit = numberToUnit;
 	exports.preZero = preZero;
 	exports.probs = probs;

package/dist/index.umd.js

@@ -152,7 +152,7 @@
 	};
 
 	const def = (target, key, value, options) => {
-	  Object.defineProperty(target, key, {
+	  return Object.defineProperty(target, key, {
 	    value,
 	    enumerable: false,
 	    writable: true,
@@ -194,8 +194,6 @@
 
 	const hasOwn = (target, key) => Object.prototype.hasOwnProperty.call(target, key);
 
-	const isObj = (target) => typeof target === "object";
-
 	const getDigit = (integer) => {
 	  let digit = -1;
 	  while (integer >= 1) {
@@ -297,7 +295,7 @@
 	  );
 	};
 
-	const flattenDecodeURIComponent = (value) => {
+	const flatten = (value, parser) => {
 	  let need = true;
 	  let safeCount = 1;
 	  let parseValue = value;
@@ -306,7 +304,7 @@
 	      throw new Error(value);
 	    }
 	    try {
-	      let next = decodeURIComponent(parseValue);
+	      let next = (parser || decodeURIComponent)(parseValue);
 	      if (parseValue === next) {
 	        need = false;
 	      }
@@ -326,25 +324,7 @@
 	  if (regex.test(value) && value.length >= 16 && +value > Number.MAX_SAFE_INTEGER) {
 	    return value;
 	  }
-	  let need = true;
-	  let safeCount = 1;
-	  let parseValue = value;
-	  while (need) {
-	    if (safeCount > 10) {
-	      throw new Error(value);
-	    }
-	    try {
-	      let next = JSON.parse(parseValue);
-	      if (parseValue === next) {
-	        need = false;
-	      }
-	      parseValue = next;
-	    } catch {
-	      need = false;
-	    }
-	    safeCount++;
-	  }
-	  return parseValue;
+	  return flatten(value, JSON.parse);
 	};
 
 	exports.asterisk = asterisk;
@@ -355,12 +335,11 @@
 	exports.dataURLToFile = dataURLToFile;
 	exports.debounce = debounce;
 	exports.def = def;
-	exports.flattenDecodeURIComponent = flattenDecodeURIComponent;
+	exports.flatten = flatten;
 	exports.flattenJSONParse = flattenJSONParse;
 	exports.getPropByPath = getPropByPath;
 	exports.getUid = getUid;
 	exports.hasOwn = hasOwn;
-	exports.isObj = isObj;
 	exports.numberToUnit = numberToUnit;
 	exports.preZero = preZero;
 	exports.probs = probs;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@deot/helper-utils",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "main": "dist/index.cjs.js",
   "module": "dist/index.es.js",
   "types": "dist/index.d.ts",