@spitx/helper 0.0.4 → 0.0.8

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 d(t){let n;const r=new Promise(e=>{n=e});return t.then(e=>{n([null,e])}).catch(e=>{n([e,null])}),r}function h(t){try{return[null,t()]}catch(n){return[n,null]}}function f(t,n){const r=[...t];let e;for(;r.length&&(e=r.shift(),!!e);){const o=n(e);Array.isArray(o)&&r.unshift(...o)}}function l(){let t;return async function(n){const r=t=Math.random()*1e7;return{data:await n,isLast:r===t}}}function w(t=()=>{}){let n=()=>{},r=()=>{};return{promise:new Promise((o,a)=>{t(o,a),n=o,r=a}),resolve:n,reject:r}}function u(t=8){const n="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";let r="";for(let e=t;e>0;--e)r+=n[~~(Math.random()*(n.length-1))];return r}function c(t,n){return new Promise(r=>{setTimeout(()=>r(n),t)})}const i=new WeakMap;async function m(t,n){const{loadingDelay:r,loadingKeep:e,signal:o=new AbortController,onSlow:a}=n;i.has(o)||i.set(o,l());const s=u();return await Promise.race([t,c(r,s)])===s&&(a(),await Promise.all([t,c(e)])),t}async function g(t,n){const r=n.signal||new AbortController;return await(i.get(r)||l())(m(t,n))}exports.flat=f;exports.handleError=d;exports.handleErrorSync=h;exports.onlyLast=l;exports.randomString=u;exports.withPromiseResolver=w;exports.withSlowLoading=g;

package/dist/main.js

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

@@ -1,45 +1,6 @@
-/**
- * 对Promise做如下处理
- * - 对请求都保持至少delay时长的loading
- * - 处理竞态请求
- * @param {AbortController} option.signal 用于标识竞态请求
- * @example
- * const signal = new AbortController()
- * const { data, isLast} = leastLoading(request, {
- *  delay: 200,
- *  signal: signal,
- * })
- * 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函数
- * - 处理竞态请求
- * @param {AbortController} option.signal 用于标识竞态请求
- * @example
- * const signal = new AbortController()
- * const loading = ref(false)
- * const { data, isLast} = slowLoading(request, {
- *  delay: 200,
- *  signal: signal,
- *  onSlow: () => {
- *    loading.value = true
- *  }
- * })
- * if (!isLast) return
- * 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.8",
   "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"