util-helpers 5.0.3 → 5.1.0

package/esm/VERSION.js

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

package/esm/checkFileType.js

@@ -0,0 +1,37 @@
+import { isBlob, isString, toString } from 'ut2';
+
+function testExt(name, ext) {
+    return !!name && name.slice(-ext.length) === ext;
+}
+function checkFileType(file, accept) {
+    if (!isBlob(file)) {
+        return false;
+    }
+    if (!isString(accept)) {
+        accept = toString(accept);
+    }
+    accept = accept.trim();
+    if (!accept || accept === '*') {
+        return true;
+    }
+    var ret = false;
+    var types = accept.toLowerCase().split(/,(?:\s+)?/);
+    var fileName = file.name.toLowerCase();
+    var fileType = file.type;
+    types.some(function (type) {
+        if (fileType === type || (type.indexOf('.') === 0 && testExt(fileName, type))) {
+            ret = true;
+        }
+        else if (type.includes('/*') && fileType.includes('/')) {
+            var match = type.match(/(.*)\/\*/);
+            var fileParentType = fileType.split('/')[0];
+            if (match && match[1] === fileParentType) {
+                ret = true;
+            }
+        }
+        return ret;
+    });
+    return ret;
+}
+
+export { checkFileType as default };

package/esm/getFileType.js

@@ -0,0 +1,25 @@
+import { isBlob, forEach } from 'ut2';
+import checkFileType from './checkFileType.js';
+
+var config = {
+    image: 'image/*,.jpeg,.jpg,.gif,.bmp,.png,.webp',
+    audio: 'audio/*,.mp3,.wav',
+    video: 'video/*,.mp4,.webm,.ogg,.ogv,.ogm',
+    pdf: 'application/pdf,.pdf',
+    word: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document,.doc,.docx',
+    excel: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet,application/vnd.ms-excel,.xls,.xlsx'
+};
+function getFileType(file) {
+    var type;
+    if (isBlob(file)) {
+        forEach(config, function (accept, fileType) {
+            if (checkFileType(file, accept)) {
+                type = fileType;
+                return false;
+            }
+        });
+    }
+    return type;
+}
+
+export { getFileType as default };

package/esm/index.js

@@ -42,9 +42,11 @@ export { default as gcd } from './gcd.js';
 export { default as lcm } from './lcm.js';
 export { default as ajax } from './ajax.js';
 export { default as calculateCursorPosition } from './calculateCursorPosition.js';
+export { default as checkFileType } from './checkFileType.js';
 export { default as compressImage } from './compressImage.js';
 export { default as download } from './download.js';
 export { default as getFileBlob } from './getFileBlob.js';
+export { default as getFileType } from './getFileType.js';
 export { default as getImageInfo } from './getImageInfo.js';
 export { default as loadImage } from './loadImage.js';
 export { default as loadImageWithBlob } from './loadImageWithBlob.js';

package/esm/parseIdCard.js

@@ -1,4 +1,4 @@
-var regIdCard = /^(?<province>\d{2})(?<city>\d{2})(?<area>\d{2})(?<year>(?:\d{2})?\d{2})(?<month>\d{2})(?<day>\d{2})\d{2}(?<gender>\d)(?:\d|X)?$/i;
+var regIdCard = /^(\d{2})(\d{2})(\d{2})((?:\d{2})?\d{2})(\d{2})(\d{2})\d{2}(\d)(?:\d|X)?$/i;
 var Provinces = [
     ['11', '北京市'],
     ['12', '天津市'],
@@ -41,7 +41,7 @@ function parseIdCard(id) {
     if (!match) {
         return null;
     }
-    var origin = match.groups || {
+    var origin = {
         province: match[1],
         city: match[2],
         area: match[3],

package/lib/VERSION.js

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

package/lib/checkFileType.js

@@ -0,0 +1,39 @@
+'use strict';
+
+var ut2 = require('ut2');
+
+function testExt(name, ext) {
+    return !!name && name.slice(-ext.length) === ext;
+}
+function checkFileType(file, accept) {
+    if (!ut2.isBlob(file)) {
+        return false;
+    }
+    if (!ut2.isString(accept)) {
+        accept = ut2.toString(accept);
+    }
+    accept = accept.trim();
+    if (!accept || accept === '*') {
+        return true;
+    }
+    var ret = false;
+    var types = accept.toLowerCase().split(/,(?:\s+)?/);
+    var fileName = file.name.toLowerCase();
+    var fileType = file.type;
+    types.some(function (type) {
+        if (fileType === type || (type.indexOf('.') === 0 && testExt(fileName, type))) {
+            ret = true;
+        }
+        else if (type.includes('/*') && fileType.includes('/')) {
+            var match = type.match(/(.*)\/\*/);
+            var fileParentType = fileType.split('/')[0];
+            if (match && match[1] === fileParentType) {
+                ret = true;
+            }
+        }
+        return ret;
+    });
+    return ret;
+}
+
+module.exports = checkFileType;

package/lib/getFileType.js

@@ -0,0 +1,27 @@
+'use strict';
+
+var ut2 = require('ut2');
+var checkFileType = require('./checkFileType.js');
+
+var config = {
+    image: 'image/*,.jpeg,.jpg,.gif,.bmp,.png,.webp',
+    audio: 'audio/*,.mp3,.wav',
+    video: 'video/*,.mp4,.webm,.ogg,.ogv,.ogm',
+    pdf: 'application/pdf,.pdf',
+    word: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document,.doc,.docx',
+    excel: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet,application/vnd.ms-excel,.xls,.xlsx'
+};
+function getFileType(file) {
+    var type;
+    if (ut2.isBlob(file)) {
+        ut2.forEach(config, function (accept, fileType) {
+            if (checkFileType(file, accept)) {
+                type = fileType;
+                return false;
+            }
+        });
+    }
+    return type;
+}
+
+module.exports = getFileType;

package/lib/index.js

@@ -44,9 +44,11 @@ var gcd = require('./gcd.js');
 var lcm = require('./lcm.js');
 var ajax = require('./ajax.js');
 var calculateCursorPosition = require('./calculateCursorPosition.js');
+var checkFileType = require('./checkFileType.js');
 var compressImage = require('./compressImage.js');
 var download = require('./download.js');
 var getFileBlob = require('./getFileBlob.js');
+var getFileType = require('./getFileType.js');
 var getImageInfo = require('./getImageInfo.js');
 var loadImage = require('./loadImage.js');
 var loadImageWithBlob = require('./loadImageWithBlob.js');
@@ -110,9 +112,11 @@ exports.gcd = gcd;
 exports.lcm = lcm;
 exports.ajax = ajax;
 exports.calculateCursorPosition = calculateCursorPosition;
+exports.checkFileType = checkFileType;
 exports.compressImage = compressImage;
 exports.download = download;
 exports.getFileBlob = getFileBlob;
+exports.getFileType = getFileType;
 exports.getImageInfo = getImageInfo;
 exports.loadImage = loadImage;
 exports.loadImageWithBlob = loadImageWithBlob;

package/lib/parseIdCard.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var regIdCard = /^(?<province>\d{2})(?<city>\d{2})(?<area>\d{2})(?<year>(?:\d{2})?\d{2})(?<month>\d{2})(?<day>\d{2})\d{2}(?<gender>\d)(?:\d|X)?$/i;
+var regIdCard = /^(\d{2})(\d{2})(\d{2})((?:\d{2})?\d{2})(\d{2})(\d{2})\d{2}(\d)(?:\d|X)?$/i;
 var Provinces = [
     ['11', '北京市'],
     ['12', '天津市'],
@@ -43,7 +43,7 @@ function parseIdCard(id) {
     if (!match) {
         return null;
     }
-    var origin = match.groups || {
+    var origin = {
         province: match[1],
         city: match[2],
         area: match[3],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "util-helpers",
-  "version": "5.0.3",
+  "version": "5.1.0",
   "description": "一个基于业务场景的工具方法库",
   "main": "lib/index.js",
   "module": "esm/index.js",
@@ -18,9 +18,9 @@
     "build:doc": "npm run doc",
     "doc": "rm -rf docs && rm -rf docs-src && tsc -p tsconfig.build.json -t esnext --outDir docs-src && jsdoc -c conf.json && rm -rf docs-src",
     "doc:open": "open ./docs/index.html",
-    "prettier": "prettier --write 'src/**/*.ts' && prettier --write 'test/**/*.ts'",
-    "lint": "eslint src --ext .ts",
-    "lint:fix": "eslint src --ext .ts --fix",
+    "prettier": "prettier -w **/*",
+    "lint": "eslint . --ext .js,.jsx,.ts,.tsx",
+    "lint:fix": "eslint . --ext .js,.jsx,.ts,.tsx --fix",
     "commit": "cz",
     "prepublishOnly": "npm test && npm run build",
     "tsc": "tsc --noEmit",
@@ -63,8 +63,8 @@
     "@rollup/plugin-terser": "^0.4.4",
     "@rollup/plugin-typescript": "^11.1.6",
     "@types/jest": "^29.5.12",
-    "@typescript-eslint/eslint-plugin": "^7.14.1",
-    "@typescript-eslint/parser": "^7.14.1",
+    "@typescript-eslint/eslint-plugin": "^7.16.0",
+    "@typescript-eslint/parser": "^7.16.0",
     "babel-jest": "^29.7.0",
     "babel-plugin-minify-replace": "^0.5.0",
     "commitizen": "^4.3.0",
@@ -79,12 +79,12 @@
     "jsdoc": "^4.0.3",
     "lint-staged": "^13.3.0",
     "prettier": "^3.3.2",
-    "rollup": "^4.18.0",
-    "typescript": "^5.5.2"
+    "rollup": "^4.18.1",
+    "typescript": "^5.5.3"
   },
   "lint-staged": {
     "**/*.ts": "eslint",
-    "**/*.{js,ts,md}": "prettier --write"
+    "**/*.{js,ts,md}": "prettier -w"
   },
   "config": {
     "commitizen": {
@@ -93,9 +93,8 @@
   },
   "dependencies": {
     "cache2": "^3.0.0",
-    "emitter-pro": "^1.2.1",
     "tslib": "^2.6.3",
-    "ut2": "^1.9.2"
+    "ut2": "^1.10.1"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"

package/types/checkFileType.d.ts

@@ -0,0 +1,14 @@
+/**
+ * 检查文件是否符合 `accept` 类型说明符。
+ *
+ * @static
+ * @alias module:Other.checkFileType
+ * @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 {string} [accept] 文件类型说明符。
+ * @returns {boolean} 如果 `file` 符合 `accept` 返回 `true`， 否则返回 `false`。
+ */
+declare function checkFileType(file: File, accept?: string): boolean;
+export default checkFileType;

package/types/getFileType.d.ts

@@ -0,0 +1,11 @@
+/**
+ * 获取文件类型
+ *
+ * @static
+ * @alias module:Other.getFileType
+ * @since 5.1.0
+ * @param {File} file 文件对象。
+ * @returns {"image" | "audio" | "video" | "pdf" | "word" | "excel" | undefined} 如果是 `image` `audio` `video` `pdf` `word` `excel` 这些类型的文件，返回对应的类型值，否则返回 `undefined`。
+ */
+declare function getFileType(file: File): "image" | "audio" | "video" | "pdf" | "word" | "excel" | undefined;
+export default getFileType;

package/types/index.d.ts

@@ -99,9 +99,11 @@ export { default as lcm } from './lcm';
  */
 export { default as ajax } from './ajax';
 export { default as calculateCursorPosition } from './calculateCursorPosition';
+export { default as checkFileType } from './checkFileType';
 export { default as compressImage } from './compressImage';
 export { default as download } from './download';
 export { default as getFileBlob } from './getFileBlob';
+export { default as getFileType } from './getFileType';
 export { default as getImageInfo } from './getImageInfo';
 export { default as loadImage } from './loadImage';
 export { default as loadImageWithBlob } from './loadImageWithBlob';