qidian-shared 1.0.39 → 1.0.40

package/dist/index.mjs

@@ -15,13 +15,14 @@ import { easyDownload } from "./utils/download.mjs";
 import { b2mb, cutFileSuffix, cutFilename, isTypeByName } from "./utils/file.mjs";
 import { decrypt, encrypt } from "./utils/jsencrypt.mjs";
 import { parseRelaxedJSON } from "./utils/json.mjs";
-import { suspectedWrapperPromise, to, waitTime } from "./utils/promise.mjs";
+import { abortWrapper, suspectedWrapperPromise, to, waitTime } from "./utils/promise.mjs";
 import { camelize, initialConversion, kebabCase } from "./utils/str.mjs";
 import { identifyType, isFunction, isObject, isPromise, objToStr, toTypeStr } from "./utils/type.mjs";
 import { deleteUrlParams, getUrlParam, getUrlParams, setUrlParam } from "./utils/url.mjs";
 import { validator, validatorRegs } from "./utils/validator.mjs";
 export {
   MD5,
+  abortWrapper,
   b2mb,
   buildTree,
   camelize,

package/dist/utils/promise.d.ts

@@ -1,3 +1,7 @@
 export declare function to<T, U = Error>(promise: Promise<T>, errorExt?: object): Promise<[U, undefined] | [null, T]>;
 export declare function suspectedWrapperPromise<T, U = Error>(p: T | Promise<T>): Promise<[U, undefined] | [null, T]>;
+export interface AbortWrapperPromise<T = any> extends Promise<T> {
+    abort?: (reasonToAbort: any) => void;
+}
+export declare function abortWrapper<T>(p1: Promise<T>): AbortWrapperPromise<T>;
 export declare function waitTime(time: number): Promise<void>;

package/dist/utils/promise.mjs

@@ -17,12 +17,20 @@ async function suspectedWrapperPromise(p) {
     return [null, p];
   }
 }
+function abortWrapper(p1) {
+  let abort;
+  const p2 = new Promise((resolve, reject) => abort = reject);
+  const p = Promise.race([p1, p2]);
+  p.abort = abort;
+  return p;
+}
 function waitTime(time) {
   return new Promise((resolve) => {
     setTimeout(resolve, time);
   });
 }
 export {
+  abortWrapper,
   suspectedWrapperPromise,
   to,
   waitTime

package/dist/utils/promise.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"promise.mjs","sources":["../../src/utils/promise.ts"],"sourcesContent":["import { isPromise } from './type'\n\n/**\n * https://blog.grossman.io/how-to-write-async-await-without-try-catch-blocks-in-javascript/\n * @param promise\n * @param errorExt 你可以传递给 err 对象的附加信息\n * @returns [err, res]\n */\nexport function to<T, U = Error>(\n  promise: Promise<T>,\n  errorExt?: object\n): Promise<[U, undefined] | [null, T]> {\n  return promise\n    .then<[null, T]>((data: T) => [null, data])\n    .catch<[U, undefined]>((err: U) => {\n      if (errorExt) {\n        const parsedError = { ...err, ...errorExt }\n        return [parsedError, undefined]\n      }\n\n      return [err ?? (true as U), undefined]\n    })\n}\n\n/**\n * 疑似Promise包装器\n * @param promise\n */\nexport async function suspectedWrapperPromise<T, U = Error>(\n  p: T | Promise<T>\n): Promise<[U, undefined] | [null, T]> {\n  if (isPromise(p)) {\n    const [err, res] = await to<T, U>(p as Promise<T>)\n    if (err) return [err, undefined]\n\n    return [null, res as T]\n  } else {\n    return [null, p]\n  }\n}\n\n/**\n * 等待\n * @param time 毫秒\n */\nexport function waitTime(time: number) {\n  return new Promise<void>((resolve) => {\n    setTimeout(resolve, time)\n  })\n}\n"],"names":[],"mappings":";AAQO,SAAS,GACd,SACA,UACqC;AACrC,SAAO,QACJ,KAAgB,CAAC,SAAY,CAAC,MAAM,IAAI,CAAC,EACzC,MAAsB,CAAC,QAAW;AACjC,QAAI,UAAU;AACZ,YAAM,cAAc,EAAE,GAAG,KAAK,GAAG,SAAA;AACjC,aAAO,CAAC,aAAa,MAAS;AAAA,IAChC;AAEA,WAAO,CAAC,OAAQ,MAAY,MAAS;AAAA,EACvC,CAAC;AACL;AAMA,eAAsB,wBACpB,GACqC;AACrC,MAAI,UAAU,CAAC,GAAG;AAChB,UAAM,CAAC,KAAK,GAAG,IAAI,MAAM,GAAS,CAAe;AACjD,QAAI,IAAK,QAAO,CAAC,KAAK,MAAS;AAE/B,WAAO,CAAC,MAAM,GAAQ;AAAA,EACxB,OAAO;AACL,WAAO,CAAC,MAAM,CAAC;AAAA,EACjB;AACF;AAMO,SAAS,SAAS,MAAc;AACrC,SAAO,IAAI,QAAc,CAAC,YAAY;AACpC,eAAW,SAAS,IAAI;AAAA,EAC1B,CAAC;AACH;"}
+{"version":3,"file":"promise.mjs","sources":["../../src/utils/promise.ts"],"sourcesContent":["import { isPromise } from './type'\n\n/**\n * https://blog.grossman.io/how-to-write-async-await-without-try-catch-blocks-in-javascript/\n * @param promise\n * @param errorExt 你可以传递给 err 对象的附加信息\n * @returns [err, res]\n */\nexport function to<T, U = Error>(\n  promise: Promise<T>,\n  errorExt?: object\n): Promise<[U, undefined] | [null, T]> {\n  return promise\n    .then<[null, T]>((data: T) => [null, data])\n    .catch<[U, undefined]>((err: U) => {\n      if (errorExt) {\n        const parsedError = { ...err, ...errorExt }\n        return [parsedError, undefined]\n      }\n\n      return [err ?? (true as U), undefined]\n    })\n}\n\n/**\n * 疑似Promise包装器\n * @param promise\n */\nexport async function suspectedWrapperPromise<T, U = Error>(\n  p: T | Promise<T>\n): Promise<[U, undefined] | [null, T]> {\n  if (isPromise(p)) {\n    const [err, res] = await to<T, U>(p as Promise<T>)\n    if (err) return [err, undefined]\n\n    return [null, res as T]\n  } else {\n    return [null, p]\n  }\n}\n\n/**\n * 中止包装器\n * @param {promise} p1\n * @return {promise}\n */\nexport interface AbortWrapperPromise<T = any> extends Promise<T> {\n  abort?: (reasonToAbort: any) => void\n}\nexport function abortWrapper<T>(p1: Promise<T>) {\n  let abort\n  const p2 = new Promise((resolve, reject) => (abort = reject))\n  const p = Promise.race([p1, p2]) as AbortWrapperPromise<T>\n  p.abort = abort\n  return p\n}\n\n/**\n * 等待\n * @param time 毫秒\n */\nexport function waitTime(time: number) {\n  return new Promise<void>((resolve) => {\n    setTimeout(resolve, time)\n  })\n}\n"],"names":[],"mappings":";AAQO,SAAS,GACd,SACA,UACqC;AACrC,SAAO,QACJ,KAAgB,CAAC,SAAY,CAAC,MAAM,IAAI,CAAC,EACzC,MAAsB,CAAC,QAAW;AACjC,QAAI,UAAU;AACZ,YAAM,cAAc,EAAE,GAAG,KAAK,GAAG,SAAA;AACjC,aAAO,CAAC,aAAa,MAAS;AAAA,IAChC;AAEA,WAAO,CAAC,OAAQ,MAAY,MAAS;AAAA,EACvC,CAAC;AACL;AAMA,eAAsB,wBACpB,GACqC;AACrC,MAAI,UAAU,CAAC,GAAG;AAChB,UAAM,CAAC,KAAK,GAAG,IAAI,MAAM,GAAS,CAAe;AACjD,QAAI,IAAK,QAAO,CAAC,KAAK,MAAS;AAE/B,WAAO,CAAC,MAAM,GAAQ;AAAA,EACxB,OAAO;AACL,WAAO,CAAC,MAAM,CAAC;AAAA,EACjB;AACF;AAUO,SAAS,aAAgB,IAAgB;AAC9C,MAAI;AACJ,QAAM,KAAK,IAAI,QAAQ,CAAC,SAAS,WAAY,QAAQ,MAAO;AAC5D,QAAM,IAAI,QAAQ,KAAK,CAAC,IAAI,EAAE,CAAC;AAC/B,IAAE,QAAQ;AACV,SAAO;AACT;AAMO,SAAS,SAAS,MAAc;AACrC,SAAO,IAAI,QAAc,CAAC,YAAY;AACpC,eAAW,SAAS,IAAI;AAAA,EAC1B,CAAC;AACH;"}

package/dist/utils/validator.d.ts

@@ -3,4 +3,4 @@ export declare const validatorRegs: {
     telephone: RegExp;
     url: RegExp;
 };
-export declare function validator(value: string, type: keyof typeof validatorRegs | 'empty', required?: boolean): boolean | null;
+export declare function validator(value: string | number | undefined | null, type: keyof typeof validatorRegs | 'empty', required?: boolean): boolean | null;

package/dist/utils/validator.mjs

@@ -9,7 +9,7 @@ function validator(value, type, required = false) {
   const reg = validatorRegs[type];
   if (!reg) throw new Error(`[validator] 没有 ${type} 类型`);
   if (required && isEmpty(value)) return null;
-  return reg.test(value);
+  return isEmpty(value) ? false : reg.test(value + "");
 }
 export {
   validator,

package/dist/utils/validator.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"validator.mjs","sources":["../../src/utils/validator.ts"],"sourcesContent":["import { isEmpty } from './common'\n\nexport const validatorRegs = {\n  cellPhone: /^1[3-9]\\d{9}$/,\n  telephone: /^\\d{7,8}$/,\n  url: /^((blob:)*(https|http|ftp|rtsp|mms|wss)?:\\/\\/)[-A-Za-z0-9+&@#/%?=~_|!:,.;]+[-A-Za-z0-9+&@#/%=~_|]/\n}\n\n/**\n * 验证器函数 - 检查输入值是否符合指定规则\n * @param value 要验证的字符串值\n * @param type 验证类型\n * @param required 是否必填，必填时空值返回 null\n * @returns 验证结果：通过返回 true，失败返回 false，必填为空返回 null\n * @throws Error 当传入不支持的验证类型时抛出异常\n */\nexport function validator(\n  value: string,\n  type: keyof typeof validatorRegs | 'empty',\n  required = false\n) {\n  if (type === 'empty') return isEmpty(value)\n\n  const reg = validatorRegs[type]\n  if (!reg) throw new Error(`[validator] 没有 ${type} 类型`)\n  if (required && isEmpty(value)) return null\n\n  return reg.test(value)\n}\n"],"names":[],"mappings":";AAEO,MAAM,gBAAgB;AAAA,EAC3B,WAAW;AAAA,EACX,WAAW;AAAA,EACX,KAAK;AACP;AAUO,SAAS,UACd,OACA,MACA,WAAW,OACX;AACA,MAAI,SAAS,QAAS,QAAO,QAAQ,KAAK;AAE1C,QAAM,MAAM,cAAc,IAAI;AAC9B,MAAI,CAAC,IAAK,OAAM,IAAI,MAAM,kBAAkB,IAAI,KAAK;AACrD,MAAI,YAAY,QAAQ,KAAK,EAAG,QAAO;AAEvC,SAAO,IAAI,KAAK,KAAK;AACvB;"}
+{"version":3,"file":"validator.mjs","sources":["../../src/utils/validator.ts"],"sourcesContent":["import { isEmpty } from './common'\n\nexport const validatorRegs = {\n  cellPhone: /^1[3-9]\\d{9}$/,\n  telephone: /^\\d{7,8}$/,\n  url: /^((blob:)*(https|http|ftp|rtsp|mms|wss)?:\\/\\/)[-A-Za-z0-9+&@#/%?=~_|!:,.;]+[-A-Za-z0-9+&@#/%=~_|]/\n}\n\n/**\n * 验证器函数 - 检查输入值是否符合指定规则\n * @param value 要验证的字符串值\n * @param type 验证类型\n * @param required 是否必填，必填时空值返回 null\n * @returns 验证结果：通过返回 true，失败返回 false，必填为空返回 null\n * @throws Error 当传入不支持的验证类型时抛出异常\n */\nexport function validator(\n  value: string | number | undefined | null,\n  type: keyof typeof validatorRegs | 'empty',\n  required = false\n) {\n  if (type === 'empty') return isEmpty(value)\n\n  const reg = validatorRegs[type]\n  if (!reg) throw new Error(`[validator] 没有 ${type} 类型`)\n  if (required && isEmpty(value)) return null\n\n  return isEmpty(value) ? false : reg.test(value + '')\n}\n"],"names":[],"mappings":";AAEO,MAAM,gBAAgB;AAAA,EAC3B,WAAW;AAAA,EACX,WAAW;AAAA,EACX,KAAK;AACP;AAUO,SAAS,UACd,OACA,MACA,WAAW,OACX;AACA,MAAI,SAAS,QAAS,QAAO,QAAQ,KAAK;AAE1C,QAAM,MAAM,cAAc,IAAI;AAC9B,MAAI,CAAC,IAAK,OAAM,IAAI,MAAM,kBAAkB,IAAI,KAAK;AACrD,MAAI,YAAY,QAAQ,KAAK,EAAG,QAAO;AAEvC,SAAO,QAAQ,KAAK,IAAI,QAAQ,IAAI,KAAK,QAAQ,EAAE;AACrD;"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "qidian-shared",
-  "version": "1.0.39",
+  "version": "1.0.40",
   "description": "QiDian 共享工具函数和钩子",
   "type": "module",
   "author": "qidian",