util-helpers 5.3.0 → 5.4.0

package/esm/VERSION.js

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

package/esm/checkFileType.js

@@ -1,5 +1,6 @@
 import { isFile, isString, toString } from 'ut2';
-import { isUploadFile, testExt } from './utils/file.util.js';
+import { isUploadFile } from './utils/file.util.js';
+import getExtname from './getExtname.js';
 
 function checkFileType(file, accept) {
     var _a, _b;
@@ -20,7 +21,7 @@ function checkFileType(file, accept) {
     var fileType = file.type || (!isFileType && ((_b = file.originFileObj) === null || _b === void 0 ? void 0 : _b.type)) || '';
     var fileUrl = (!isFileType && file.url) || '';
     types.some(function (type) {
-        if (type === '*' || fileType === type || (type.indexOf('.') === 0 && (testExt(fileName, type) || testExt(fileUrl, type)))) {
+        if (type === '*' || fileType === type || (type.indexOf('.') === 0 && (getExtname(fileName) === type || getExtname(fileUrl) === type))) {
             ret = true;
         }
         else if (type.includes('/*') && fileType.includes('/')) {

package/esm/getExtname.js

@@ -0,0 +1,7 @@
+import { isString, nth } from 'ut2';
+
+function getExtname(path) {
+    return isString(path) && path.indexOf('.') > 0 ? '.' + nth(path.split('.'), -1) : '';
+}
+
+export { getExtname as default };

package/esm/getMimeType.js

@@ -1,5 +1,5 @@
+import getExtname from './getExtname.js';
 import { nativeUndefined } from './utils/native.js';
-import { getExtname } from './utils/file.util.js';
 
 var mimeTypes = [
     ['text/plain', ['txt']],

package/esm/index.js

@@ -53,6 +53,7 @@ export { default as loadImage } from './loadImage.js';
 export { default as loadImageWithBlob } from './loadImageWithBlob.js';
 export { default as loadScript } from './loadScript.js';
 export { default as calculateCursorPosition } from './calculateCursorPosition.js';
+export { default as getExtname } from './getExtname.js';
 export { default as randomString } from './randomString.js';
 export { default as strlen } from './strlen.js';
 export { default as transformFieldNames } from './transformFieldNames.js';

package/esm/injectStyle.js

@@ -1,5 +1,5 @@
 function injectStyle(css, options) {
-    var _a = options || {}, _b = _a.container, container = _b === void 0 ? document.head || document.getElementsByTagName('head')[0] || document.body : _b, _c = _a.insertAt, insertAt = _c === void 0 ? 'top' : _c;
+    var _a = options || {}, _b = _a.container, container = _b === void 0 ? document.head || document.getElementsByTagName('head')[0] || document.body : _b, _c = _a.insertAt, insertAt = _c === void 0 ? 'top' : _c, onBefore = _a.onBefore;
     var style = document.createElement('style');
     if (style.styleSheet) {
         style.styleSheet.cssText = css;
@@ -7,6 +7,9 @@ function injectStyle(css, options) {
     else {
         style.appendChild(document.createTextNode(css));
     }
+    if (typeof onBefore === 'function') {
+        onBefore(style);
+    }
     var atTop = insertAt === 'top';
     if (atTop && container.prepend) {
         container.prepend(style);

package/esm/utils/file.util.js

@@ -1,11 +1,5 @@
-import { isString, nth, isObjectLike } from 'ut2';
+import { isObjectLike, isString } from 'ut2';
 
-function getExtname(name) {
-    return isString(name) && name.indexOf('.') > 0 ? '.' + nth(name.split('.'), -1) : '';
-}
-function testExt(name, ext) {
-    return !!name && getExtname(name) === ext;
-}
 function isUploadFile(fileObj) {
     if (isObjectLike(fileObj) && isString(fileObj.name)) {
         return true;
@@ -13,4 +7,4 @@ function isUploadFile(fileObj) {
     return false;
 }
 
-export { getExtname, isUploadFile, testExt };
+export { isUploadFile };

package/lib/VERSION.js

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

package/lib/checkFileType.js

@@ -2,6 +2,7 @@
 
 var ut2 = require('ut2');
 var file_util = require('./utils/file.util.js');
+var getExtname = require('./getExtname.js');
 
 function checkFileType(file, accept) {
     var _a, _b;
@@ -22,7 +23,7 @@ function checkFileType(file, accept) {
     var fileType = file.type || (!isFileType && ((_b = file.originFileObj) === null || _b === void 0 ? void 0 : _b.type)) || '';
     var fileUrl = (!isFileType && file.url) || '';
     types.some(function (type) {
-        if (type === '*' || fileType === type || (type.indexOf('.') === 0 && (file_util.testExt(fileName, type) || file_util.testExt(fileUrl, type)))) {
+        if (type === '*' || fileType === type || (type.indexOf('.') === 0 && (getExtname(fileName) === type || getExtname(fileUrl) === type))) {
             ret = true;
         }
         else if (type.includes('/*') && fileType.includes('/')) {

package/lib/getExtname.js

@@ -0,0 +1,9 @@
+'use strict';
+
+var ut2 = require('ut2');
+
+function getExtname(path) {
+    return ut2.isString(path) && path.indexOf('.') > 0 ? '.' + ut2.nth(path.split('.'), -1) : '';
+}
+
+module.exports = getExtname;

package/lib/getMimeType.js

@@ -1,7 +1,7 @@
 'use strict';
 
+var getExtname = require('./getExtname.js');
 var native = require('./utils/native.js');
-var file_util = require('./utils/file.util.js');
 
 var mimeTypes = [
     ['text/plain', ['txt']],
@@ -38,7 +38,7 @@ var mimeTypes = [
 ];
 function getMimeType(fileName) {
     var _a;
-    var ext = file_util.getExtname(fileName).slice(1);
+    var ext = getExtname(fileName).slice(1);
     return ext ? (_a = mimeTypes.find(function (item) { return item[1].includes(ext); })) === null || _a === void 0 ? void 0 : _a[0] : native.nativeUndefined;
 }
 

package/lib/index.js

@@ -55,6 +55,7 @@ var loadImage = require('./loadImage.js');
 var loadImageWithBlob = require('./loadImageWithBlob.js');
 var loadScript = require('./loadScript.js');
 var calculateCursorPosition = require('./calculateCursorPosition.js');
+var getExtname = require('./getExtname.js');
 var randomString = require('./randomString.js');
 var strlen = require('./strlen.js');
 var transformFieldNames = require('./transformFieldNames.js');
@@ -125,6 +126,7 @@ exports.loadImage = loadImage;
 exports.loadImageWithBlob = loadImageWithBlob;
 exports.loadScript = loadScript;
 exports.calculateCursorPosition = calculateCursorPosition;
+exports.getExtname = getExtname;
 exports.randomString = randomString;
 exports.strlen = strlen;
 exports.transformFieldNames = transformFieldNames;

package/lib/injectStyle.js

@@ -1,7 +1,7 @@
 'use strict';
 
 function injectStyle(css, options) {
-    var _a = options || {}, _b = _a.container, container = _b === void 0 ? document.head || document.getElementsByTagName('head')[0] || document.body : _b, _c = _a.insertAt, insertAt = _c === void 0 ? 'top' : _c;
+    var _a = options || {}, _b = _a.container, container = _b === void 0 ? document.head || document.getElementsByTagName('head')[0] || document.body : _b, _c = _a.insertAt, insertAt = _c === void 0 ? 'top' : _c, onBefore = _a.onBefore;
     var style = document.createElement('style');
     if (style.styleSheet) {
         style.styleSheet.cssText = css;
@@ -9,6 +9,9 @@ function injectStyle(css, options) {
     else {
         style.appendChild(document.createTextNode(css));
     }
+    if (typeof onBefore === 'function') {
+        onBefore(style);
+    }
     var atTop = insertAt === 'top';
     if (atTop && container.prepend) {
         container.prepend(style);

package/lib/utils/file.util.js

@@ -2,12 +2,6 @@
 
 var ut2 = require('ut2');
 
-function getExtname(name) {
-    return ut2.isString(name) && name.indexOf('.') > 0 ? '.' + ut2.nth(name.split('.'), -1) : '';
-}
-function testExt(name, ext) {
-    return !!name && getExtname(name) === ext;
-}
 function isUploadFile(fileObj) {
     if (ut2.isObjectLike(fileObj) && ut2.isString(fileObj.name)) {
         return true;
@@ -15,6 +9,4 @@ function isUploadFile(fileObj) {
     return false;
 }
 
-exports.getExtname = getExtname;
 exports.isUploadFile = isUploadFile;
-exports.testExt = testExt;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "util-helpers",
-  "version": "5.3.0",
+  "version": "5.4.0",
   "description": "一个基于业务场景的工具方法库",
   "main": "lib/index.js",
   "module": "esm/index.js",
@@ -51,9 +51,9 @@
   },
   "homepage": "https://doly-dev.github.io/util-helpers/index.html",
   "devDependencies": {
-    "@babel/core": "^7.25.8",
-    "@babel/preset-env": "^7.25.8",
-    "@babel/preset-typescript": "^7.25.7",
+    "@babel/core": "^7.26.0",
+    "@babel/preset-env": "^7.26.0",
+    "@babel/preset-typescript": "^7.26.0",
     "@commitlint/cli": "^17.8.1",
     "@commitlint/config-conventional": "^17.8.1",
     "@commitlint/cz-commitlint": "^17.8.1",
@@ -62,7 +62,7 @@
     "@rollup/plugin-replace": "^5.0.7",
     "@rollup/plugin-terser": "^0.4.4",
     "@rollup/plugin-typescript": "^11.1.6",
-    "@types/jest": "^29.5.13",
+    "@types/jest": "^29.5.14",
     "@typescript-eslint/eslint-plugin": "^7.18.0",
     "@typescript-eslint/parser": "^7.18.0",
     "babel-jest": "^29.7.0",
@@ -71,16 +71,16 @@
     "cross-env": "^7.0.3",
     "docdash": "^2.0.2",
     "eslint": "^8.57.1",
-    "husky": "^9.1.6",
+    "husky": "^9.1.7",
     "inquirer": "^8.2.6",
     "jest": "^29.7.0",
     "jest-canvas-mock": "^2.5.2",
     "jest-environment-jsdom": "^29.7.0",
     "jsdoc": "^4.0.4",
     "lint-staged": "^13.3.0",
-    "prettier": "^3.3.3",
-    "rollup": "^4.24.0",
-    "typescript": "^5.6.3"
+    "prettier": "^3.4.2",
+    "rollup": "^4.28.0",
+    "typescript": "^5.7.2"
   },
   "lint-staged": {
     "**/*.ts": "eslint",
@@ -92,9 +92,9 @@
     }
   },
   "dependencies": {
-    "cache2": "^3.1.1",
-    "tslib": "^2.8.0",
-    "ut2": "^1.13.0"
+    "cache2": "^3.1.2",
+    "tslib": "^2.8.1",
+    "ut2": "^1.15.0"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"

package/types/AsyncMemo.d.ts

@@ -38,6 +38,15 @@ declare class AsyncMemo<DataType = any> {
      * @param {number} [options.ttl] 数据存活时间
      * @param {boolean} [options.persisted=true] 数据持久化，默认`true`。如果存在缓存数据，直接返回缓存数据，不再执行异步方法。<br/>即使不开启该配置，不影响在异步执行成功后缓存数据。
      * @returns {Promise<*>} 异步结果
+     * @example
+     *
+     * const asyncMemo = new AsyncMemo();
+     * asyncMemo.run(()=>download({ fssid: 'a' }), 'a');
+     * asyncMemo.run(()=>download({ fssid: 'b' }), 'b');
+     * asyncMemo.run(()=>download({ fssid: 'a' }), 'a'); // 如果有缓存结果直接返回，如果有异步执行中，不会重复触发异步，但共享异步结果。
+     *
+     * asyncMemo.run(()=>download({ fssid: 'a' }), 'a', { persisted: false }); // 不读取缓存结果，但是异步执行结果还是会缓存。
+     * asyncMemo.run(()=>download({ fssid: 'a' })); // 没有缓存键时，直接执行异步方法，不读取缓存结果，也不会缓存异步结果。
      */
     run(asyncFn: (...args: any[]) => Promise<DataType>, key?: string, options?: {
         ttl?: number;

package/types/getExtname.d.ts

@@ -0,0 +1,18 @@
+/**
+ * 获取路径的扩展名。
+ *
+ * @alias module:Other.getExtname
+ * @since 5.4.0
+ * @see {@link https://nodejs.org/docs/latest/api/path.html#pathextnamepath | Node.js path.extname}
+ * @param {string} path 路径。
+ * @returns 返回从最后一次出现 `.` 字符到路径最后一部分的字符串结尾。如果路径没有 `.` 或者除了第一个字符之外没有其他 `.` 字符，则返回空字符串。
+ * @example
+ * getExtname('index.html'); // '.html'
+ * getExtname('index.coffee.md'); // '.md'
+ * getExtname('index.'); // '.'
+ * getExtname('index'); // ''
+ * getExtname('.index'); // ''
+ * getExtname('index.md'); // '.md'
+ */
+declare function getExtname(path: string): string;
+export default getExtname;

package/types/index.d.ts

@@ -113,6 +113,7 @@ export { default as loadScript } from './loadScript';
  * @module Other
  */
 export { default as calculateCursorPosition } from './calculateCursorPosition';
+export { default as getExtname } from './getExtname';
 export { default as randomString } from './randomString';
 export { default as strlen } from './strlen';
 /**

package/types/injectStyle.d.ts

@@ -7,10 +7,25 @@
  * @param {Object} [options] 配置项。
  * @param {HTMLElement} [options.container=document.head] 要注入样式的容器。默认 `document.head`。如果 `document.head` 不存在，默认 `document.body`。
  * @param {'top' | 'bottom'} [options.insertAt='top'] 注入容器内容前面还是后面。默认 `top`。
+ * @param {Function} [options.onBefore] 注入样式前的回调方法。
  * @returns {HTMLStyleElement} `style` 元素。
+ * @example
+ * const css1 = 'body { background-color: red; }';
+ * injectStyle(css1);
+ *
+ * // 自定义配置
+ * const css2 = 'p { margin: 10px; } a { color: blue; }';
+ * injectStyle(css2, {
+ *   container: document.body,
+ *   insertAt: 'bottom'，
+ *   onBefore(style){
+ *     style.nonce = '...';
+ *   }
+ * });
  */
 declare function injectStyle(css: string, options?: {
     container?: HTMLElement;
     insertAt?: 'top' | 'bottom';
+    onBefore?: (style: HTMLStyleElement) => void;
 }): HTMLStyleElement;
 export default injectStyle;

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

@@ -1,5 +1,3 @@
-export declare function getExtname(name: string): string;
-export declare function testExt(name: string | undefined, ext: string): boolean;
 export type UploadFile = {
     name: string;
     type?: string;