util-helpers 5.1.0 → 5.1.2

package/esm/VERSION.js

@@ -1,4 +1,4 @@
-var VERSION = "5.1.0";
+var VERSION = "5.1.2";
 var VERSION$1 = VERSION;
 
 export { VERSION$1 as default };

package/esm/checkFileType.js

@@ -1,10 +1,8 @@
-import { isBlob, isString, toString } from 'ut2';
+import { isFile, isString, toString } from 'ut2';
+import { isUploadFile, testExt } from './utils/file.util.js';
 
-function testExt(name, ext) {
-    return !!name && name.slice(-ext.length) === ext;
-}
 function checkFileType(file, accept) {
-    if (!isBlob(file)) {
+    if (!isFile(file) && !isUploadFile(file)) {
         return false;
     }
     if (!isString(accept)) {
@@ -17,9 +15,10 @@ function checkFileType(file, accept) {
     var ret = false;
     var types = accept.toLowerCase().split(/,(?:\s+)?/);
     var fileName = file.name.toLowerCase();
-    var fileType = file.type;
+    var fileType = file.type || '';
+    var fileUrl = file.url || '';
     types.some(function (type) {
-        if (fileType === type || (type.indexOf('.') === 0 && testExt(fileName, type))) {
+        if (type === '*' || fileType === type || (type.indexOf('.') === 0 && (testExt(fileName, type) || testExt(fileUrl, type)))) {
             ret = true;
         }
         else if (type.includes('/*') && fileType.includes('/')) {

package/esm/formatMoney.js

@@ -1,5 +1,5 @@
 import { __read } from 'tslib';
-import { isNaN } from 'ut2';
+import { isString, isNumber, isNaN } from 'ut2';
 import { transformEffectiveNumber, checkBoundary, trimLeftZero } from './utils/math.util.js';
 import devWarn from './utils/devWarn.js';
 import isValidNumber from './isValidNumber.js';
@@ -41,10 +41,9 @@ function formatDec(decStr, precision, decimal) {
     return decimal + ret;
 }
 var formatMoney = function (num, options) {
-    if (num === void 0) { num = ''; }
     if (options === void 0) { options = {}; }
-    var _a = options.precision, precision = _a === void 0 ? 2 : _a, symbol = options.symbol, _b = options.thousand, thousand = _b === void 0 ? ',' : _b, _c = options.decimal, decimal = _c === void 0 ? '.' : _c;
-    if (!checkNumber(num)) {
+    var _a = options.precision, precision = _a === void 0 ? 2 : _a, symbol = options.symbol, _b = options.thousand, thousand = _b === void 0 ? ',' : _b, _c = options.decimal, decimal = _c === void 0 ? '.' : _c, _d = options.strict, strict = _d === void 0 ? true : _d;
+    if (!checkNumber(num) || (strict && (!isString(num) || num === '') && !isNumber(num))) {
         return '';
     }
     if (typeof num === 'number' && !isFinite(num)) {
@@ -60,7 +59,7 @@ var formatMoney = function (num, options) {
     thousand = typeof thousand === 'string' ? thousand : ',';
     decimal = typeof decimal === 'string' ? decimal : '.';
     var strNum = transformEffectiveNumber(num) + '';
-    var _d = __read(strNum.split('.'), 2), intStr = _d[0], decStr = _d[1];
+    var _e = __read(strNum.split('.'), 2), intStr = _e[0], decStr = _e[1];
     return symbol + formatInt(intStr, thousand) + formatDec(decStr, precision, decimal);
 };
 var formatMoney$1 = formatMoney;

package/esm/getFileType.js

@@ -1,5 +1,6 @@
 import { isBlob, forEach } from 'ut2';
 import checkFileType from './checkFileType.js';
+import { isUploadFile } from './utils/file.util.js';
 
 var config = {
     image: 'image/*,.jpeg,.jpg,.gif,.bmp,.png,.webp',
@@ -11,7 +12,7 @@ var config = {
 };
 function getFileType(file) {
     var type;
-    if (isBlob(file)) {
+    if (isBlob(file) || isUploadFile(file)) {
         forEach(config, function (accept, fileType) {
             if (checkFileType(file, accept)) {
                 type = fileType;

package/esm/utils/file.util.js

@@ -0,0 +1,13 @@
+import { isObjectLike, isString } from 'ut2';
+
+function testExt(name, ext) {
+    return !!name && name.slice(-ext.length) === ext;
+}
+function isUploadFile(fileObj) {
+    if (isObjectLike(fileObj) && isString(fileObj.uid) && isString(fileObj.name)) {
+        return true;
+    }
+    return false;
+}
+
+export { isUploadFile, testExt };

package/lib/VERSION.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var VERSION = "5.1.0";
+var VERSION = "5.1.2";
 var VERSION$1 = VERSION;
 
 module.exports = VERSION$1;

package/lib/checkFileType.js

@@ -1,12 +1,10 @@
 'use strict';
 
 var ut2 = require('ut2');
+var file_util = require('./utils/file.util.js');
 
-function testExt(name, ext) {
-    return !!name && name.slice(-ext.length) === ext;
-}
 function checkFileType(file, accept) {
-    if (!ut2.isBlob(file)) {
+    if (!ut2.isFile(file) && !file_util.isUploadFile(file)) {
         return false;
     }
     if (!ut2.isString(accept)) {
@@ -19,9 +17,10 @@ function checkFileType(file, accept) {
     var ret = false;
     var types = accept.toLowerCase().split(/,(?:\s+)?/);
     var fileName = file.name.toLowerCase();
-    var fileType = file.type;
+    var fileType = file.type || '';
+    var fileUrl = file.url || '';
     types.some(function (type) {
-        if (fileType === type || (type.indexOf('.') === 0 && testExt(fileName, type))) {
+        if (type === '*' || fileType === type || (type.indexOf('.') === 0 && (file_util.testExt(fileName, type) || file_util.testExt(fileUrl, type)))) {
             ret = true;
         }
         else if (type.includes('/*') && fileType.includes('/')) {

package/lib/formatMoney.js

@@ -43,10 +43,9 @@ function formatDec(decStr, precision, decimal) {
     return decimal + ret;
 }
 var formatMoney = function (num, options) {
-    if (num === void 0) { num = ''; }
     if (options === void 0) { options = {}; }
-    var _a = options.precision, precision = _a === void 0 ? 2 : _a, symbol = options.symbol, _b = options.thousand, thousand = _b === void 0 ? ',' : _b, _c = options.decimal, decimal = _c === void 0 ? '.' : _c;
-    if (!checkNumber(num)) {
+    var _a = options.precision, precision = _a === void 0 ? 2 : _a, symbol = options.symbol, _b = options.thousand, thousand = _b === void 0 ? ',' : _b, _c = options.decimal, decimal = _c === void 0 ? '.' : _c, _d = options.strict, strict = _d === void 0 ? true : _d;
+    if (!checkNumber(num) || (strict && (!ut2.isString(num) || num === '') && !ut2.isNumber(num))) {
         return '';
     }
     if (typeof num === 'number' && !isFinite(num)) {
@@ -62,7 +61,7 @@ var formatMoney = function (num, options) {
     thousand = typeof thousand === 'string' ? thousand : ',';
     decimal = typeof decimal === 'string' ? decimal : '.';
     var strNum = math_util.transformEffectiveNumber(num) + '';
-    var _d = tslib.__read(strNum.split('.'), 2), intStr = _d[0], decStr = _d[1];
+    var _e = tslib.__read(strNum.split('.'), 2), intStr = _e[0], decStr = _e[1];
     return symbol + formatInt(intStr, thousand) + formatDec(decStr, precision, decimal);
 };
 var formatMoney$1 = formatMoney;

package/lib/getFileType.js

@@ -2,6 +2,7 @@
 
 var ut2 = require('ut2');
 var checkFileType = require('./checkFileType.js');
+var file_util = require('./utils/file.util.js');
 
 var config = {
     image: 'image/*,.jpeg,.jpg,.gif,.bmp,.png,.webp',
@@ -13,7 +14,7 @@ var config = {
 };
 function getFileType(file) {
     var type;
-    if (ut2.isBlob(file)) {
+    if (ut2.isBlob(file) || file_util.isUploadFile(file)) {
         ut2.forEach(config, function (accept, fileType) {
             if (checkFileType(file, accept)) {
                 type = fileType;

package/lib/utils/file.util.js

@@ -0,0 +1,16 @@
+'use strict';
+
+var ut2 = require('ut2');
+
+function testExt(name, ext) {
+    return !!name && name.slice(-ext.length) === ext;
+}
+function isUploadFile(fileObj) {
+    if (ut2.isObjectLike(fileObj) && ut2.isString(fileObj.uid) && ut2.isString(fileObj.name)) {
+        return true;
+    }
+    return false;
+}
+
+exports.isUploadFile = isUploadFile;
+exports.testExt = testExt;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "util-helpers",
-  "version": "5.1.0",
+  "version": "5.1.2",
   "description": "一个基于业务场景的工具方法库",
   "main": "lib/index.js",
   "module": "esm/index.js",
@@ -94,7 +94,7 @@
   "dependencies": {
     "cache2": "^3.0.0",
     "tslib": "^2.6.3",
-    "ut2": "^1.10.1"
+    "ut2": "^1.11.0"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"

package/types/checkFileType.d.ts

@@ -1,3 +1,4 @@
+import { UploadFile } from './utils/file.util';
 /**
  * 检查文件是否符合 `accept` 类型说明符。
  *
@@ -6,9 +7,29 @@
  * @since 5.1.0
  * @see {@link https://developer.mozilla.org/zh-CN/docs/Web/HTML/Element/input/file#唯一文件类型说明符 唯一文件类型说明符}
  * @see {@link https://www.iana.org/assignments/media-types/media-types.xhtml Media Types}
- * @param {File} file 文件对象。
+ * @param {File} file 文件对象。支持 antd `UploadFile` 对象。
  * @param {string} [accept] 文件类型说明符。
  * @returns {boolean} 如果 `file` 符合 `accept` 返回 `true`， 否则返回 `false`。
+ * @example
+ *
+ * const pdf = new File([], '1.pdf', { type: 'application/pdf' });
+ * const jpeg = new File([], 'xx.jpeg', { type: 'image/jpeg' });
+ *
+ * // 文件类型
+ * checkFileType(pdf, 'application/pdf'); // true
+ * checkFileType(jpeg, 'image/jpeg'); // true
+ *
+ * // 通配符
+ * checkFileType(jpeg, 'image/*'); // true
+ * checkFileType(pdf, 'image/*'); // false
+ * checkFileType(pdf, 'application/*'); // true
+ * checkFileType(pdf, '*'); // true
+ * checkFileType(jpeg, '*'); // true
+ *
+ * // 文件名扩展名
+ * checkFileType(jpeg, '.png,.jpeg,.jpg'); // true
+ * checkFileType(pdf, '.pdf'); // true
+ *
  */
-declare function checkFileType(file: File, accept?: string): boolean;
+declare function checkFileType(file: File | UploadFile, accept?: string): boolean;
 export default checkFileType;

package/types/formatMoney.d.ts

@@ -3,6 +3,7 @@ type Options = {
     symbol?: string;
     thousand?: string;
     decimal?: string;
+    strict?: boolean;
 };
 /**
  * 格式化金额
@@ -16,6 +17,7 @@ type Options = {
  * @param {string} [options.symbol] 货币符号
  * @param {string} [options.thousand=","] 千分位符号
  * @param {string} [options.decimal="."] 小数位符号
+ * @param {boolean} [options.strict=ture] 严格模式。开启后，只支持非空字符串和数字格式化，其他类型值如`null` `undefined` `true` `false`等将返回空字符串。
  * @returns {string} 格式化的金额
  * @example
  *

package/types/getFileType.d.ts

@@ -1,11 +1,21 @@
+import { UploadFile } from './utils/file.util';
 /**
  * 获取文件类型
  *
  * @static
  * @alias module:Other.getFileType
  * @since 5.1.0
- * @param {File} file 文件对象。
+ * @requires Other.checkFileType
+ * @param {File} file 文件对象。支持 antd `UploadFile` 对象。
  * @returns {"image" | "audio" | "video" | "pdf" | "word" | "excel" | undefined} 如果是 `image` `audio` `video` `pdf` `word` `excel` 这些类型的文件，返回对应的类型值，否则返回 `undefined`。
+ * @example
+ *
+ * const pdf = new File([], '1.pdf', { type: 'application/pdf' });
+ * const jpeg = new File([], 'xx.jpeg', { type: 'image/jpeg' });
+ *
+ * getFileType(pdf); // 'pdf'
+ * getFileType(jpeg); // 'image'
+ *
  */
-declare function getFileType(file: File): "image" | "audio" | "video" | "pdf" | "word" | "excel" | undefined;
+declare function getFileType(file: File | UploadFile): "image" | "audio" | "video" | "pdf" | "word" | "excel" | undefined;
 export default getFileType;

package/types/utils/file.util.d.ts

@@ -0,0 +1,8 @@
+export declare function testExt(name: string | undefined, ext: string): boolean;
+export type UploadFile = {
+    uid: string;
+    name: string;
+    type?: string;
+    url?: string;
+};
+export declare function isUploadFile(fileObj: UploadFile): boolean;