@spitx/helper 0.0.4 → 0.0.6

package/dist/main.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});function f(e){let n;const r=new Promise(t=>{n=t});return e.then(t=>{n([null,t])}).catch(t=>{n([t,null])}),r}function w(e){try{return[null,e()]}catch(n){return[n,null]}}function m(e,n){const r=[...e];let t;for(;r.length&&(t=r.shift(),!!t);){const o=n(t);Array.isArray(o)&&r.unshift(...o)}}function a(){let e;return async function(n){const r=e=Math.random()*1e7;return{data:await n,isLast:r===e}}}function u(e=()=>{}){let n=()=>{},r=()=>{};return{promise:new Promise((o,s)=>{e(o,s),n=o,r=s}),resolve:n,reject:r}}function g(e){return new Promise(n=>{setTimeout(n,e)})}const i=new WeakMap;async function y(e,n){const{least:r,signal:t=new AbortController}=n;i.has(t)||i.set(t,a());const o=i.get(t)||a(),[s]=await Promise.all([o(e),g(r)]);return s}async function P(e,n){const{delay:r,signal:t=new AbortController,onSlow:o}=n;i.has(t)||i.set(t,a());const s=i.get(t)||a(),{promise:h,resolve:d}=u(),l=Date.now();setTimeout(()=>d(l),r);const c=s(e);return await Promise.race([c,h])===l&&o(),c}function S(e=8){const n="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";let r="";for(let t=e;t>0;--t)r+=n[~~(Math.random()*(n.length-1))];return r}exports.flat=m;exports.handleError=f;exports.handleErrorSync=w;exports.onlyLast=a;exports.randomString=S;exports.withMinLoading=y;exports.withPromiseResolver=u;exports.withSlowLoading=P;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});function y(o){let e;const t=new Promise(n=>{e=n});return o.then(n=>{e([null,n])}).catch(n=>{e([n,null])}),t}function v(o){try{return[null,o()]}catch(e){return[e,null]}}function p(o,e){const t=[...o];let n;for(;t.length&&(n=t.shift(),!!n);){const r=e(n);Array.isArray(r)&&t.unshift(...r)}}function l(){let o;return async function(e){const t=o=Math.random()*1e7;return{data:await e,isLast:t===o}}}function c(o=()=>{}){let e=()=>{},t=()=>{};return{promise:new Promise((r,i)=>{o(r,i),e=r,t=i}),resolve:e,reject:t}}function u(o=8){const e="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";let t="";for(let n=o;n>0;--n)t+=e[~~(Math.random()*(e.length-1))];return t}const a=new WeakMap;async function L(o,e){const{loadingDelay:t,loadingKeep:n,signal:r=new AbortController,onSlow:i}=e;a.has(r)||a.set(r,l());const h=a.get(r)||l(),{promise:m,resolve:f}=c(),d=u();setTimeout(()=>f(d),t);const s=h(o);if(await Promise.race([s,m])===d){i();const{promise:g,resolve:w}=c();setTimeout(()=>w(!0),n),await Promise.all([s,g])}return s}exports.flat=p;exports.handleError=y;exports.handleErrorSync=v;exports.onlyLast=l;exports.randomString=u;exports.withPromiseResolver=c;exports.withSlowLoading=L;

package/dist/main.js

@@ -1,90 +1,90 @@
-function d(e) {
-  let n;
-  const r = new Promise((t) => {
-    n = t;
+function v(o) {
+  let e;
+  const t = new Promise((n) => {
+    e = n;
   });
-  return e.then((t) => {
-    n([null, t]);
-  }).catch((t) => {
-    n([t, null]);
-  }), r;
+  return o.then((n) => {
+    e([null, n]);
+  }).catch((n) => {
+    e([n, null]);
+  }), t;
 }
-function g(e) {
+function y(o) {
   try {
-    return [null, e()];
-  } catch (n) {
-    return [n, null];
+    return [null, o()];
+  } catch (e) {
+    return [e, null];
   }
 }
-function y(e, n) {
-  const r = [...e];
-  let t;
-  for (; r.length && (t = r.shift(), !!t); ) {
-    const o = n(t);
-    Array.isArray(o) && r.unshift(...o);
+function L(o, e) {
+  const t = [...o];
+  let n;
+  for (; t.length && (n = t.shift(), !!n); ) {
+    const r = e(n);
+    Array.isArray(r) && t.unshift(...r);
   }
 }
-function a() {
-  let e;
-  return async function(n) {
-    const r = e = Math.random() * 1e7;
+function c() {
+  let o;
+  return async function(e) {
+    const t = o = Math.random() * 1e7;
     return {
-      data: await n,
-      isLast: r === e
+      data: await e,
+      isLast: t === o
     };
   };
 }
-function h(e = () => {
+function u(o = () => {
 }) {
-  let n = () => {
-  }, r = () => {
+  let e = () => {
+  }, t = () => {
   };
   return {
-    promise: new Promise((o, s) => {
-      e(o, s), n = o, r = s;
+    promise: new Promise((r, s) => {
+      o(r, s), e = r, t = s;
     }),
-    resolve: n,
-    reject: r
+    resolve: e,
+    reject: t
   };
 }
-function m(e) {
-  return new Promise((n) => {
-    setTimeout(n, e);
-  });
-}
-const i = /* @__PURE__ */ new WeakMap();
-async function p(e, n) {
-  const { least: r, signal: t = new AbortController() } = n;
-  i.has(t) || i.set(t, a());
-  const o = i.get(t) || a(), [s] = await Promise.all([o(e), m(r)]);
-  return s;
+function w(o = 8) {
+  const e = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
+  let t = "";
+  for (let n = o; n > 0; --n)
+    t += e[~~(Math.random() * (e.length - 1))];
+  return t;
 }
-async function P(e, n) {
+const a = /* @__PURE__ */ new WeakMap();
+async function P(o, e) {
   const {
-    delay: r,
-    signal: t = new AbortController(),
-    onSlow: o
-  } = n;
-  i.has(t) || i.set(t, a());
-  const s = i.get(t) || a(), { promise: u, resolve: f } = h(), l = Date.now();
-  setTimeout(() => f(l), r);
-  const c = s(e);
-  return await Promise.race([c, u]) === l && o(), c;
-}
-function v(e = 8) {
-  const n = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
-  let r = "";
-  for (let t = e; t > 0; --t)
-    r += n[~~(Math.random() * (n.length - 1))];
-  return r;
+    loadingDelay: t,
+    loadingKeep: n,
+    signal: r = new AbortController(),
+    onSlow: s
+  } = e;
+  a.has(r) || a.set(r, c());
+  const d = a.get(r) || c(), {
+    promise: f,
+    resolve: h
+  } = u(), l = w();
+  setTimeout(() => h(l), t);
+  const i = d(o);
+  if (await Promise.race([i, f]) === l) {
+    s();
+    const {
+      promise: m,
+      resolve: g
+    } = u();
+    setTimeout(() => g(!0), n), await Promise.all([i, m]);
+  }
+  return i;
 }
 export {
-  y as flat,
-  d as handleError,
-  g as handleErrorSync,
-  a as onlyLast,
-  v as randomString,
-  p as withMinLoading,
-  h as withPromiseResolver,
+  L as flat,
+  v as handleError,
+  y as handleErrorSync,
+  c as onlyLast,
+  w as randomString,
+  u as withPromiseResolver,
   P as withSlowLoading
 };

package/dist/main.umd.cjs

@@ -1 +1 @@
-(function(r,l){typeof exports=="object"&&typeof module<"u"?l(exports):typeof define=="function"&&define.amd?define(["exports"],l):(r=typeof globalThis<"u"?globalThis:r||self,l(r.main={}))})(this,function(r){"use strict";function l(e){let n;const o=new Promise(t=>{n=t});return e.then(t=>{n([null,t])}).catch(t=>{n([t,null])}),o}function h(e){try{return[null,e()]}catch(n){return[n,null]}}function m(e,n){const o=[...e];let t;for(;o.length&&(t=o.shift(),!!t);){const i=n(t);Array.isArray(i)&&o.unshift(...i)}}function c(){let e;return async function(n){const o=e=Math.random()*1e7;return{data:await n,isLast:o===e}}}function u(e=()=>{}){let n=()=>{},o=()=>{};return{promise:new Promise((i,a)=>{e(i,a),n=i,o=a}),resolve:n,reject:o}}function w(e){return new Promise(n=>{setTimeout(n,e)})}const s=new WeakMap;async function y(e,n){const{least:o,signal:t=new AbortController}=n;s.has(t)||s.set(t,c());const i=s.get(t)||c(),[a]=await Promise.all([i(e),w(o)]);return a}async function g(e,n){const{delay:o,signal:t=new AbortController,onSlow:i}=n;s.has(t)||s.set(t,c());const a=s.get(t)||c(),{promise:S,resolve:v}=u(),f=Date.now();setTimeout(()=>v(f),o);const d=a(e);return await Promise.race([d,S])===f&&i(),d}function P(e=8){const n="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";let o="";for(let t=e;t>0;--t)o+=n[~~(Math.random()*(n.length-1))];return o}r.flat=m,r.handleError=l,r.handleErrorSync=h,r.onlyLast=c,r.randomString=P,r.withMinLoading=y,r.withPromiseResolver=u,r.withSlowLoading=g,Object.defineProperty(r,Symbol.toStringTag,{value:"Module"})});
+(function(r,s){typeof exports=="object"&&typeof module<"u"?s(exports):typeof define=="function"&&define.amd?define(["exports"],s):(r=typeof globalThis<"u"?globalThis:r||self,s(r.main={}))})(this,function(r){"use strict";function s(o){let e;const t=new Promise(n=>{e=n});return o.then(n=>{e([null,n])}).catch(n=>{e([n,null])}),t}function m(o){try{return[null,o()]}catch(e){return[e,null]}}function g(o,e){const t=[...o];let n;for(;t.length&&(n=t.shift(),!!n);){const i=e(n);Array.isArray(i)&&t.unshift(...i)}}function a(){let o;return async function(e){const t=o=Math.random()*1e7;return{data:await e,isLast:t===o}}}function c(o=()=>{}){let e=()=>{},t=()=>{};return{promise:new Promise((i,l)=>{o(i,l),e=i,t=l}),resolve:e,reject:t}}function f(o=8){const e="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";let t="";for(let n=o;n>0;--n)t+=e[~~(Math.random()*(e.length-1))];return t}const d=new WeakMap;async function y(o,e){const{loadingDelay:t,loadingKeep:n,signal:i=new AbortController,onSlow:l}=e;d.has(i)||d.set(i,a());const w=d.get(i)||a(),{promise:v,resolve:p}=c(),h=f();setTimeout(()=>p(h),t);const u=w(o);if(await Promise.race([u,v])===h){l();const{promise:L,resolve:P}=c();setTimeout(()=>P(!0),n),await Promise.all([u,L])}return u}r.flat=g,r.handleError=s,r.handleErrorSync=m,r.onlyLast=a,r.randomString=f,r.withPromiseResolver=c,r.withSlowLoading=y,Object.defineProperty(r,Symbol.toStringTag,{value:"Module"})});

package/dist/promise/index.d.ts

@@ -1,7 +1,8 @@
 type Resolver<T> = (value: T | PromiseLike<T>) => void;
-export declare function withPromiseResolver<T>(cb?: (resolve: Resolver<T>, reject: Resolver<T>) => void): {
+type withPromiseResolverReturnType<T> = {
     promise: Promise<T>;
     resolve: Resolver<T>;
     reject: Resolver<T>;
 };
+export declare function withPromiseResolver<T = unknown>(cb?: (resolve: Resolver<T>, reject: Resolver<T>) => void): withPromiseResolverReturnType<T>;
 export {};

package/dist/request/index.d.ts

@@ -1 +1 @@
-export { withMinLoading, withSlowLoading, } from './loading';
+export { withSlowLoading } from './loading';

package/dist/request/loading.d.ts

@@ -12,24 +12,19 @@
  * if (!isLast) return
  * doSomething(data)
  */
-export declare function withMinLoading<T>(p: Promise<T>, option: {
-    least: number;
-    signal?: AbortController;
-}): Promise<{
-    data: Awaited<T>;
-    isLast: boolean;
-}>;
 /**
  * 对 Promise 做如下处理
- * - 请求时长 < delay 时，不做任何处理
- * - 请求时长 > delay 且 为竞态请求的最后一个时，触发最后一个请求的onSlow函数
  * - 处理竞态请求
+ * - 请求时长 < loadingDelay 时，不做任何处理
+ * - 请求时长 > delay 且 为竞态请求的最后一个时，触发最后一个请求的onSlow函数
+ * - 并且至少loadingKeep时间后返回请求结果
  * @param {AbortController} option.signal 用于标识竞态请求
  * @example
  * const signal = new AbortController()
  * const loading = ref(false)
- * const { data, isLast} = slowLoading(request, {
- *  delay: 200,
+ * const { data, isLast} = withSlowLoading(request, {
+ *  loadingDelay: 200,
+ *  loadingKeep: 200,
  *  signal: signal,
  *  onSlow: () => {
  *    loading.value = true
@@ -39,7 +34,8 @@ export declare function withMinLoading<T>(p: Promise<T>, option: {
  * doSomething(data)
  */
 export declare function withSlowLoading<T>(p: Promise<T>, option: {
-    delay: number;
+    loadingDelay: number;
+    loadingKeep: number;
     signal?: AbortController;
     onSlow: () => void;
 }): Promise<{

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@spitx/helper",
   "type": "module",
-  "version": "0.0.4",
+  "version": "0.0.6",
   "description": "helper module",
   "author": "spitx",
   "license": "ISC",
@@ -12,7 +12,7 @@
       "types": "./dist/index.d.ts"
     }
   },
-  "main": "./main.js",
+  "main": "./dist/main.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
     "build": "vite build"