From 31c1397437d7fb7a78e97499c8d46f992c49844c Mon Sep 17 00:00:00 2001 From: Ray Epps Date: Tue, 7 Mar 2023 17:01:50 -0700 Subject: [PATCH] fix: defer function rethrowing undefined (#270) --- cdn/radash.esm.js | 2 +- cdn/radash.js | 2 +- cdn/radash.min.js | 2 +- package.json | 2 +- src/async.ts | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cdn/radash.esm.js b/cdn/radash.esm.js index af1abd3a..4d85731c 100644 --- a/cdn/radash.esm.js +++ b/cdn/radash.esm.js @@ -361,7 +361,7 @@ const defer = async (func) => { const [err, response] = await tryit(func)(register); for (const { fn, rethrow } of callbacks) { const [rethrown] = await tryit(fn)(err); - if (rethrow) + if (rethrown && rethrow) throw rethrown; } if (err) diff --git a/cdn/radash.js b/cdn/radash.js index 2a39a121..648d75a7 100644 --- a/cdn/radash.js +++ b/cdn/radash.js @@ -364,7 +364,7 @@ var radash = (function (exports) { const [err, response] = await tryit(func)(register); for (const { fn, rethrow } of callbacks) { const [rethrown] = await tryit(fn)(err); - if (rethrow) + if (rethrown && rethrow) throw rethrown; } if (err) diff --git a/cdn/radash.min.js b/cdn/radash.min.js index 344d1bfd..0ba39055 100644 --- a/cdn/radash.min.js +++ b/cdn/radash.min.js @@ -1 +1 @@ -var radash=function(u){"use strict";const _=t=>!!t&&t.constructor===Symbol,b=t=>!!t&&t.constructor===Array,k=t=>!!t&&t.constructor===Object,z=t=>t==null||typeof t!="object"&&typeof t!="function",p=t=>!!(t&&t.constructor&&t.call&&t.apply),U=t=>typeof t=="string"||t instanceof String,K=t=>h(t)&&t%1===0,J=t=>h(t)&&t%1!==0,h=t=>{try{return Number(t)===t}catch{return!1}},P=t=>Object.prototype.toString.call(t)==="[object Date]",W=t=>{if(t===!0||t===!1||t==null)return!0;if(h(t))return t===0;if(P(t))return isNaN(t.getTime());if(p(t)||_(t))return!1;const e=t.length;if(h(e))return e===0;const n=t.size;return h(n)?n===0:Object.keys(t).length===0},S=(t,e)=>{if(Object.is(t,e))return!0;if(t instanceof Date&&e instanceof Date)return t.getTime()===e.getTime();if(t instanceof RegExp&&e instanceof RegExp)return t.toString()===e.toString();if(typeof t!="object"||t===null||typeof e!="object"||e===null)return!1;const n=Reflect.ownKeys(t),r=Reflect.ownKeys(e);if(n.length!==r.length)return!1;for(let s=0;st.reduce((n,r)=>{const s=e(r);return n[s]||(n[s]=[]),n[s].push(r),n},{});function Y(...t){return!t||!t.length?[]:new Array(Math.max(...t.map(({length:e})=>e))).fill([]).map((e,n)=>t.map(r=>r[n]))}function G(t,e){if(!t||!t.length)return{};const n=p(e)?e:b(e)?(r,s)=>e[s]:(r,s)=>e;return t.reduce((r,s,c)=>(r[s]=n(s,c),r),{})}const O=(t,e)=>!t||(t.length??0)===0?null:t.reduce(e),H=(t,e)=>(t||[]).reduce((n,r)=>n+(e?e(r):r),0),Q=(t,e=void 0)=>t?.length>0?t[0]:e,V=(t,e=void 0)=>t?.length>0?t[t.length-1]:e,j=(t,e,n=!1)=>{if(!t)return[];const r=(c,i)=>e(c)-e(i),s=(c,i)=>e(i)-e(c);return t.slice().sort(n===!0?s:r)},v=(t,e,n="asc")=>{if(!t)return[];const r=(c,i)=>`${e(c)}`.localeCompare(e(i)),s=(c,i)=>`${e(i)}`.localeCompare(e(c));return t.slice().sort(n==="desc"?s:r)},x=(t,e)=>t?t.reduce((n,r)=>{const s=e(r);return n[s]=(n[s]??0)+1,n},{}):{},tt=(t,e,n)=>{if(!t)return[];if(!e)return[...t];for(let r=0;rr)=>t.reduce((r,s)=>(r[e(s)]=n(s),r),{}),et=(t,e,n)=>t?t.reduce((r,s,c)=>(n(s,c)&&r.push(e(s,c)),r),[]):[],nt=(t,e)=>{const n=e||(r=>r);return O(t,(r,s)=>n(r)>n(s)?r:s)},rt=(t,e)=>{const n=e||(r=>r);return O(t,(r,s)=>n(r){const n=Math.ceil(t.length/e);return new Array(n).fill(null).map((r,s)=>t.slice(s*e,s*e+e))},ut=(t,e)=>{const n=t.reduce((r,s)=>{const c=e?e(s):s;return r[c]||(r[c]=s),r},{});return Object.values(n)};function*A(t,e,n=s=>s,r=1){const s=p(n)?n:()=>n,c=e?t:0,i=e??t;for(let o=c;o<=i&&(yield s(o),!(o+r>i));o+=r);}const C=(t,e,n,r)=>Array.from(A(t,e,n,r)),ct=t=>t.reduce((e,n)=>(e.push(...n),e),[]),it=(t,e,n)=>{if(!t||!e)return!1;const r=n??(c=>c),s=e.reduce((c,i)=>(c[r(i)]=!0,c),{});return t.some(c=>s[r(c)])},B=(t,e)=>t?t.reduce((n,r)=>{const[s,c]=n;return e(r)?[[...s,r],c]:[s,[...c,r]]},[[],[]]):[[],[]],ot=(t,e,n)=>!e&&!t?[]:e?t?n?t.reduce((r,s)=>{const c=e.find(i=>n(s)===n(i));return c?r.push(c):r.push(s),r},[]):t:[]:t,ft=(t,e,n)=>{if(!t&&!e)return[];if(!e)return[...t];if(!t)return[e];for(let r=0;r{if(!t&&!e)return[];if(!t)return[e];if(!e)return[...t];const s=n?(o,a)=>n(o,a)===n(e,a):o=>o===e;return t.find(s)?t.filter((o,a)=>!s(o,a)):(r?.strategy??"append")==="append"?[...t,e]:[e,...t]},at=t=>t?.filter(e=>!!e)??[],L=(t,e,n)=>{let r=n;for(let s=1;s<=t;s++)r=e(r,s);return r},dt=(t,e,n=r=>r)=>{if(!t?.length&&!e?.length)return[];if(t?.length===void 0)return[...e];if(!e?.length)return[...t];const r=e.reduce((s,c)=>(s[n(c)]=!0,s),{});return t.filter(s=>!r[n(s)])};function gt(t,e){if(t.length===0)return t;const n=e%t.length;return n===0?t:[...t.slice(-n,t.length),...t.slice(0,-n)]}const ht=async(t,e,n)=>{const r=n!==void 0;if(!r&&t?.length<1)throw new Error("Cannot reduce empty array with no init value");const s=r?t:t.slice(1);let c=r?n:t[0];for(const i of s)c=await e(c,i);return c},mt=async(t,e)=>{if(!t)return[];let n=[],r=0;for(const s of t){const c=await e(s,r++);n.push(c)}return n},wt=async t=>{const e=[],n=(c,i)=>e.push({fn:c,rethrow:i?.rethrow??!1}),[r,s]=await m(t)(n);for(const{fn:c,rethrow:i}of e){const[o]=await m(c)(r);if(i)throw o}if(r)throw r;return s};class yt extends Error{constructor(e=[]){super();const n=e.find(r=>r.name)?.name??"";this.name=`AggregateError(${n}...)`,this.message=`AggregateError with ${e.length} errors`,this.stack=e.find(r=>r.stack)?.stack??this.stack,this.errors=e}}const pt=async(t,e,n)=>{const r=e.map((d,y)=>({index:y,item:d})),s=async d=>{const y=[];for(;;){const f=r.pop();if(!f)return d(y);const[l,g]=await m(n)(f.item);y.push({error:l,result:g,index:f.index})}},c=C(1,t).map(()=>new Promise(s)),i=await Promise.all(c),[o,a]=B(j(i.flat(),d=>d.index),d=>!!d.error);if(o.length>0)throw new yt(o.map(d=>d.error));return a.map(d=>d.result)},bt=async(t,e)=>{const n=t?.times??3,r=t?.delay,s=t?.backoff??null;for(const c of A(1,n)){const[i,o]=await m(e)(a=>{throw{_exited:a}});if(!i)return o;if(i._exited)throw i._exited;if(c===n)throw i;r&&await E(r),s&&await E(s(c))}},E=t=>new Promise(e=>setTimeout(e,t)),m=t=>async(...e)=>{try{return[void 0,await t(...e)]}catch(n){return[n,void 0]}},kt=(...t)=>(...e)=>t.slice(1).reduce((n,r)=>r(n),t[0](...e)),Ot=(...t)=>t.reverse().reduce((e,n)=>n(e)),At=(t,...e)=>(...n)=>t(...e,...n),Ct=(t,e)=>n=>t({...e,...n}),Et=t=>new Proxy({},{get:(e,n)=>t(n)}),$t=(t,e,n,r)=>function(...c){const i=n?n(...c):JSON.stringify({args:c}),o=t[i];if(o!==void 0&&(!o.exp||o.exp>new Date().getTime()))return o.value;const a=e(...c);return t[i]={exp:r?new Date().getTime()+r:null,value:a},a},Nt=(t,e={})=>$t({},t,e.key??null,e.ttl??null),_t=({delay:t},e)=>{let n,r=!0;const s=(...c)=>{r?(clearTimeout(n),n=setTimeout(()=>{r&&e(...c)},t)):e(...c)};return s.cancel=()=>{r=!1},s.flush=(...c)=>e(...c),s},zt=({interval:t},e)=>{let n=!0;return(...s)=>{n&&(e(...s),n=!1,setTimeout(()=>{n=!0},t))}},Pt=(t,e)=>{const n=()=>{};return new Proxy(Object.assign(n,t),{get:(r,s)=>r[s],set:(r,s,c)=>(r[s]=c,!0),apply:(r,s,c)=>e(Object.assign({},r))(...c)})},St=(t,e)=>{const n=e===void 0?0:e;if(t==null)return n;const r=parseFloat(t);return isNaN(r)?n:r},M=(t,e)=>{const n=e===void 0?0:e;if(t==null)return n;const r=parseInt(t);return isNaN(r)?n:r},jt=(t,e=n=>n===void 0)=>t?Object.keys(t).reduce((r,s)=>(e(t[s])||(r[s]=t[s]),r),{}):{},$=(t,e)=>Object.keys(t).reduce((r,s)=>(r[e(s,t[s])]=t[s],r),{}),Tt=(t,e)=>Object.keys(t).reduce((r,s)=>(r[s]=e(t[s],s),r),{}),Bt=(t,e)=>t?Object.entries(t).reduce((n,[r,s])=>{const[c,i]=e(r,s);return n[c]=i,n},{}):{},Lt=t=>t?Object.keys(t).reduce((n,r)=>(n[t[r]]=r,n),{}):{},Mt=t=>$(t,e=>e.toLowerCase()),Dt=t=>$(t,e=>e.toUpperCase()),D=t=>{if(z(t))return t;if(typeof t=="function")return t.bind({});const e=new t.constructor;return Object.getOwnPropertyNames(t).forEach(n=>{e[n]=t[n]}),e},Ft=(t,e)=>{if(!t)return[];const n=Object.entries(t);return n.length===0?[]:n.reduce((r,s)=>(r.push(e(s[0],s[1])),r),[])},Rt=(t,e)=>t?e.reduce((n,r)=>(t.hasOwnProperty(r)&&(n[r]=t[r]),n),{}):{},Zt=(t,e)=>t?!e||e.length===0?t:e.reduce((n,r)=>(delete n[r],n),{...t}):{},F=(t,e,n=null)=>{const r=e.split(/[\.\[\]]/g);let s=t;for(const c of r){if(s===null||s===void 0)return n;c.trim()!==""&&(s=s[c])}return s===void 0?n:s},R=(t,e,n)=>{if(!t)return{};if(!e||!n)return t;const r=e.split(/[\.\[\]]/g).filter(i=>!!i.trim()),s=i=>{if(r.length>1){const o=r.shift(),a=M(r[0],null)!==null;i[o]=i[o]===void 0?a?[]:{}:i[o],s(i[o])}else i[r[0]]=n},c=D(t);return s(c),c},Z=(t,e)=>!t&&!e?{}:t?e?Object.entries(t).reduce((n,[r,s])=>({...n,[r]:(()=>k(s)?Z(s,e[r]):e[r])()}),{}):t:e,I=t=>{if(!t)return[];const e=(n,r)=>k(n)?Object.entries(n).flatMap(([s,c])=>e(c,[...r,s])):b(n)?n.flatMap((s,c)=>e(s,[...r,`${c}`])):[r.join(".")];return e(t,[])},It=t=>t?T(I(t),e=>e,e=>F(t,e)):{},qt=t=>t?Object.keys(t).reduce((e,n)=>R(e,n,t[n]),{}):{},N=(t,e)=>Math.floor(Math.random()*(e-t+1)+t),Ut=t=>{const e=t.length;if(e===0)return null;const n=N(0,e-1);return t[n]},Kt=t=>t.map(e=>({rand:Math.random(),value:e})).sort((e,n)=>e.rand-n.rand).map(e=>e.value),Jt=(t,e="")=>{const n="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"+e;return L(t,r=>r+n.charAt(N(0,n.length-1)),"")},Wt=(t,e=n=>`${n}`)=>{const{indexesByKey:n,itemsByIndex:r}=t.reduce((f,l,g)=>({indexesByKey:{...f.indexesByKey,[e(l)]:g},itemsByIndex:{...f.itemsByIndex,[g]:l}}),{indexesByKey:{},itemsByIndex:{}}),s=(f,l)=>n[e(f)]n[e(f)]>n[e(l)]?f:l,i=()=>r[0],o=()=>r[t.length-1],a=(f,l)=>r[n[e(f)]+1]??l??i(),d=(f,l)=>r[n[e(f)]-1]??l??o();return{min:s,max:c,first:i,last:o,next:a,previous:d,spin:(f,l)=>{if(l===0)return f;const g=Math.abs(l),xt=g>t.length?g%t.length:g;return C(0,xt-1).reduce(q=>l>0?a(q):d(q),f)}}},w=t=>{if(!t||t.length===0)return"";const e=t.toLowerCase();return e.substring(0,1).toUpperCase()+e.substring(1,e.length)},Xt=t=>{const e=t?.replace(/([A-Z])+/g,w)?.split(/(?=[A-Z])|[\.\-\s_]/).map(n=>n.toLowerCase())??[];return e.length===0?"":e.length===1?e[0]:e.reduce((n,r)=>`${n}${r.charAt(0).toUpperCase()}${r.slice(1)}`)},Yt=t=>{const e=t?.replace(/([A-Z])+/g,w).split(/(?=[A-Z])|[\.\-\s_]/).map(n=>n.toLowerCase())??[];return e.length===0?"":e.length===1?e[0]:e.reduce((n,r)=>`${n}_${r.toLowerCase()}`)},Gt=t=>{const e=t?.replace(/([A-Z])+/g,w)?.split(/(?=[A-Z])|[\.\-\s_]/).map(n=>n.toLowerCase())??[];return e.length===0?"":e.length===1?e[0]:e.reduce((n,r)=>`${n}-${r.toLowerCase()}`)},Ht=t=>{const e=t?.split(/[\.\-\s_]/).map(n=>n.toLowerCase())??[];return e.length===0?"":e.map(n=>n.charAt(0).toUpperCase()+n.slice(1)).join("")},Qt=t=>t?t.split(/(?=[A-Z])|[\.\-\s_]/).map(e=>e.trim()).filter(e=>!!e).map(e=>w(e.toLowerCase())).join(" "):"",Vt=(t,e,n=/\{\{(.+?)\}\}/g)=>Array.from(t.matchAll(n)).reduce((r,s)=>r.replace(s[0],e[s[1]]),t),vt=(t,e=" ")=>{if(!t)return"";const n=new RegExp(`^[${e}]+|[${e}]+$`,"g");return t.replace(n,"")};return u.alphabetical=v,u.assign=Z,u.boil=O,u.callable=Pt,u.camel=Xt,u.capitalize=w,u.chain=kt,u.clone=D,u.cluster=st,u.compose=Ot,u.construct=qt,u.counting=x,u.crush=It,u.dash=Gt,u.debounce=_t,u.defer=wt,u.diff=dt,u.draw=Ut,u.first=Q,u.flat=ct,u.fork=B,u.get=F,u.group=X,u.intersects=it,u.invert=Lt,u.isArray=b,u.isDate=P,u.isEmpty=W,u.isEqual=S,u.isFloat=J,u.isFunction=p,u.isInt=K,u.isNumber=h,u.isObject=k,u.isPrimitive=z,u.isString=U,u.isSymbol=_,u.iterate=L,u.keys=I,u.last=V,u.list=C,u.listify=Ft,u.lowerize=Mt,u.map=mt,u.mapEntries=Bt,u.mapKeys=$,u.mapValues=Tt,u.max=nt,u.memo=Nt,u.merge=ot,u.min=rt,u.objectify=T,u.omit=Zt,u.parallel=pt,u.partial=At,u.partob=Ct,u.pascal=Ht,u.pick=Rt,u.proxied=Et,u.random=N,u.range=A,u.reduce=ht,u.replace=tt,u.replaceOrAppend=ft,u.retry=bt,u.select=et,u.series=Wt,u.set=R,u.shake=jt,u.shift=gt,u.shuffle=Kt,u.sift=at,u.sleep=E,u.snake=Yt,u.sort=j,u.sum=H,u.template=Vt,u.throttle=zt,u.title=Qt,u.toFloat=St,u.toInt=M,u.toggle=lt,u.trim=vt,u.try=m,u.tryit=m,u.uid=Jt,u.unique=ut,u.upperize=Dt,u.zip=Y,u.zipToObject=G,u}({}); +var radash=function(u){"use strict";const _=t=>!!t&&t.constructor===Symbol,b=t=>!!t&&t.constructor===Array,k=t=>!!t&&t.constructor===Object,z=t=>t==null||typeof t!="object"&&typeof t!="function",p=t=>!!(t&&t.constructor&&t.call&&t.apply),U=t=>typeof t=="string"||t instanceof String,K=t=>h(t)&&t%1===0,J=t=>h(t)&&t%1!==0,h=t=>{try{return Number(t)===t}catch{return!1}},P=t=>Object.prototype.toString.call(t)==="[object Date]",W=t=>{if(t===!0||t===!1||t==null)return!0;if(h(t))return t===0;if(P(t))return isNaN(t.getTime());if(p(t)||_(t))return!1;const e=t.length;if(h(e))return e===0;const n=t.size;return h(n)?n===0:Object.keys(t).length===0},S=(t,e)=>{if(Object.is(t,e))return!0;if(t instanceof Date&&e instanceof Date)return t.getTime()===e.getTime();if(t instanceof RegExp&&e instanceof RegExp)return t.toString()===e.toString();if(typeof t!="object"||t===null||typeof e!="object"||e===null)return!1;const n=Reflect.ownKeys(t),r=Reflect.ownKeys(e);if(n.length!==r.length)return!1;for(let s=0;st.reduce((n,r)=>{const s=e(r);return n[s]||(n[s]=[]),n[s].push(r),n},{});function Y(...t){return!t||!t.length?[]:new Array(Math.max(...t.map(({length:e})=>e))).fill([]).map((e,n)=>t.map(r=>r[n]))}function G(t,e){if(!t||!t.length)return{};const n=p(e)?e:b(e)?(r,s)=>e[s]:(r,s)=>e;return t.reduce((r,s,c)=>(r[s]=n(s,c),r),{})}const O=(t,e)=>!t||(t.length??0)===0?null:t.reduce(e),H=(t,e)=>(t||[]).reduce((n,r)=>n+(e?e(r):r),0),Q=(t,e=void 0)=>t?.length>0?t[0]:e,V=(t,e=void 0)=>t?.length>0?t[t.length-1]:e,j=(t,e,n=!1)=>{if(!t)return[];const r=(c,i)=>e(c)-e(i),s=(c,i)=>e(i)-e(c);return t.slice().sort(n===!0?s:r)},v=(t,e,n="asc")=>{if(!t)return[];const r=(c,i)=>`${e(c)}`.localeCompare(e(i)),s=(c,i)=>`${e(i)}`.localeCompare(e(c));return t.slice().sort(n==="desc"?s:r)},x=(t,e)=>t?t.reduce((n,r)=>{const s=e(r);return n[s]=(n[s]??0)+1,n},{}):{},tt=(t,e,n)=>{if(!t)return[];if(!e)return[...t];for(let r=0;rr)=>t.reduce((r,s)=>(r[e(s)]=n(s),r),{}),et=(t,e,n)=>t?t.reduce((r,s,c)=>(n(s,c)&&r.push(e(s,c)),r),[]):[],nt=(t,e)=>{const n=e||(r=>r);return O(t,(r,s)=>n(r)>n(s)?r:s)},rt=(t,e)=>{const n=e||(r=>r);return O(t,(r,s)=>n(r){const n=Math.ceil(t.length/e);return new Array(n).fill(null).map((r,s)=>t.slice(s*e,s*e+e))},ut=(t,e)=>{const n=t.reduce((r,s)=>{const c=e?e(s):s;return r[c]||(r[c]=s),r},{});return Object.values(n)};function*A(t,e,n=s=>s,r=1){const s=p(n)?n:()=>n,c=e?t:0,i=e??t;for(let o=c;o<=i&&(yield s(o),!(o+r>i));o+=r);}const C=(t,e,n,r)=>Array.from(A(t,e,n,r)),ct=t=>t.reduce((e,n)=>(e.push(...n),e),[]),it=(t,e,n)=>{if(!t||!e)return!1;const r=n??(c=>c),s=e.reduce((c,i)=>(c[r(i)]=!0,c),{});return t.some(c=>s[r(c)])},B=(t,e)=>t?t.reduce((n,r)=>{const[s,c]=n;return e(r)?[[...s,r],c]:[s,[...c,r]]},[[],[]]):[[],[]],ot=(t,e,n)=>!e&&!t?[]:e?t?n?t.reduce((r,s)=>{const c=e.find(i=>n(s)===n(i));return c?r.push(c):r.push(s),r},[]):t:[]:t,ft=(t,e,n)=>{if(!t&&!e)return[];if(!e)return[...t];if(!t)return[e];for(let r=0;r{if(!t&&!e)return[];if(!t)return[e];if(!e)return[...t];const s=n?(o,a)=>n(o,a)===n(e,a):o=>o===e;return t.find(s)?t.filter((o,a)=>!s(o,a)):(r?.strategy??"append")==="append"?[...t,e]:[e,...t]},at=t=>t?.filter(e=>!!e)??[],L=(t,e,n)=>{let r=n;for(let s=1;s<=t;s++)r=e(r,s);return r},dt=(t,e,n=r=>r)=>{if(!t?.length&&!e?.length)return[];if(t?.length===void 0)return[...e];if(!e?.length)return[...t];const r=e.reduce((s,c)=>(s[n(c)]=!0,s),{});return t.filter(s=>!r[n(s)])};function gt(t,e){if(t.length===0)return t;const n=e%t.length;return n===0?t:[...t.slice(-n,t.length),...t.slice(0,-n)]}const ht=async(t,e,n)=>{const r=n!==void 0;if(!r&&t?.length<1)throw new Error("Cannot reduce empty array with no init value");const s=r?t:t.slice(1);let c=r?n:t[0];for(const i of s)c=await e(c,i);return c},mt=async(t,e)=>{if(!t)return[];let n=[],r=0;for(const s of t){const c=await e(s,r++);n.push(c)}return n},wt=async t=>{const e=[],n=(c,i)=>e.push({fn:c,rethrow:i?.rethrow??!1}),[r,s]=await m(t)(n);for(const{fn:c,rethrow:i}of e){const[o]=await m(c)(r);if(o&&i)throw o}if(r)throw r;return s};class yt extends Error{constructor(e=[]){super();const n=e.find(r=>r.name)?.name??"";this.name=`AggregateError(${n}...)`,this.message=`AggregateError with ${e.length} errors`,this.stack=e.find(r=>r.stack)?.stack??this.stack,this.errors=e}}const pt=async(t,e,n)=>{const r=e.map((d,y)=>({index:y,item:d})),s=async d=>{const y=[];for(;;){const f=r.pop();if(!f)return d(y);const[l,g]=await m(n)(f.item);y.push({error:l,result:g,index:f.index})}},c=C(1,t).map(()=>new Promise(s)),i=await Promise.all(c),[o,a]=B(j(i.flat(),d=>d.index),d=>!!d.error);if(o.length>0)throw new yt(o.map(d=>d.error));return a.map(d=>d.result)},bt=async(t,e)=>{const n=t?.times??3,r=t?.delay,s=t?.backoff??null;for(const c of A(1,n)){const[i,o]=await m(e)(a=>{throw{_exited:a}});if(!i)return o;if(i._exited)throw i._exited;if(c===n)throw i;r&&await E(r),s&&await E(s(c))}},E=t=>new Promise(e=>setTimeout(e,t)),m=t=>async(...e)=>{try{return[void 0,await t(...e)]}catch(n){return[n,void 0]}},kt=(...t)=>(...e)=>t.slice(1).reduce((n,r)=>r(n),t[0](...e)),Ot=(...t)=>t.reverse().reduce((e,n)=>n(e)),At=(t,...e)=>(...n)=>t(...e,...n),Ct=(t,e)=>n=>t({...e,...n}),Et=t=>new Proxy({},{get:(e,n)=>t(n)}),$t=(t,e,n,r)=>function(...c){const i=n?n(...c):JSON.stringify({args:c}),o=t[i];if(o!==void 0&&(!o.exp||o.exp>new Date().getTime()))return o.value;const a=e(...c);return t[i]={exp:r?new Date().getTime()+r:null,value:a},a},Nt=(t,e={})=>$t({},t,e.key??null,e.ttl??null),_t=({delay:t},e)=>{let n,r=!0;const s=(...c)=>{r?(clearTimeout(n),n=setTimeout(()=>{r&&e(...c)},t)):e(...c)};return s.cancel=()=>{r=!1},s.flush=(...c)=>e(...c),s},zt=({interval:t},e)=>{let n=!0;return(...s)=>{n&&(e(...s),n=!1,setTimeout(()=>{n=!0},t))}},Pt=(t,e)=>{const n=()=>{};return new Proxy(Object.assign(n,t),{get:(r,s)=>r[s],set:(r,s,c)=>(r[s]=c,!0),apply:(r,s,c)=>e(Object.assign({},r))(...c)})},St=(t,e)=>{const n=e===void 0?0:e;if(t==null)return n;const r=parseFloat(t);return isNaN(r)?n:r},M=(t,e)=>{const n=e===void 0?0:e;if(t==null)return n;const r=parseInt(t);return isNaN(r)?n:r},jt=(t,e=n=>n===void 0)=>t?Object.keys(t).reduce((r,s)=>(e(t[s])||(r[s]=t[s]),r),{}):{},$=(t,e)=>Object.keys(t).reduce((r,s)=>(r[e(s,t[s])]=t[s],r),{}),Tt=(t,e)=>Object.keys(t).reduce((r,s)=>(r[s]=e(t[s],s),r),{}),Bt=(t,e)=>t?Object.entries(t).reduce((n,[r,s])=>{const[c,i]=e(r,s);return n[c]=i,n},{}):{},Lt=t=>t?Object.keys(t).reduce((n,r)=>(n[t[r]]=r,n),{}):{},Mt=t=>$(t,e=>e.toLowerCase()),Dt=t=>$(t,e=>e.toUpperCase()),D=t=>{if(z(t))return t;if(typeof t=="function")return t.bind({});const e=new t.constructor;return Object.getOwnPropertyNames(t).forEach(n=>{e[n]=t[n]}),e},Ft=(t,e)=>{if(!t)return[];const n=Object.entries(t);return n.length===0?[]:n.reduce((r,s)=>(r.push(e(s[0],s[1])),r),[])},Rt=(t,e)=>t?e.reduce((n,r)=>(t.hasOwnProperty(r)&&(n[r]=t[r]),n),{}):{},Zt=(t,e)=>t?!e||e.length===0?t:e.reduce((n,r)=>(delete n[r],n),{...t}):{},F=(t,e,n=null)=>{const r=e.split(/[\.\[\]]/g);let s=t;for(const c of r){if(s===null||s===void 0)return n;c.trim()!==""&&(s=s[c])}return s===void 0?n:s},R=(t,e,n)=>{if(!t)return{};if(!e||!n)return t;const r=e.split(/[\.\[\]]/g).filter(i=>!!i.trim()),s=i=>{if(r.length>1){const o=r.shift(),a=M(r[0],null)!==null;i[o]=i[o]===void 0?a?[]:{}:i[o],s(i[o])}else i[r[0]]=n},c=D(t);return s(c),c},Z=(t,e)=>!t&&!e?{}:t?e?Object.entries(t).reduce((n,[r,s])=>({...n,[r]:(()=>k(s)?Z(s,e[r]):e[r])()}),{}):t:e,I=t=>{if(!t)return[];const e=(n,r)=>k(n)?Object.entries(n).flatMap(([s,c])=>e(c,[...r,s])):b(n)?n.flatMap((s,c)=>e(s,[...r,`${c}`])):[r.join(".")];return e(t,[])},It=t=>t?T(I(t),e=>e,e=>F(t,e)):{},qt=t=>t?Object.keys(t).reduce((e,n)=>R(e,n,t[n]),{}):{},N=(t,e)=>Math.floor(Math.random()*(e-t+1)+t),Ut=t=>{const e=t.length;if(e===0)return null;const n=N(0,e-1);return t[n]},Kt=t=>t.map(e=>({rand:Math.random(),value:e})).sort((e,n)=>e.rand-n.rand).map(e=>e.value),Jt=(t,e="")=>{const n="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"+e;return L(t,r=>r+n.charAt(N(0,n.length-1)),"")},Wt=(t,e=n=>`${n}`)=>{const{indexesByKey:n,itemsByIndex:r}=t.reduce((f,l,g)=>({indexesByKey:{...f.indexesByKey,[e(l)]:g},itemsByIndex:{...f.itemsByIndex,[g]:l}}),{indexesByKey:{},itemsByIndex:{}}),s=(f,l)=>n[e(f)]n[e(f)]>n[e(l)]?f:l,i=()=>r[0],o=()=>r[t.length-1],a=(f,l)=>r[n[e(f)]+1]??l??i(),d=(f,l)=>r[n[e(f)]-1]??l??o();return{min:s,max:c,first:i,last:o,next:a,previous:d,spin:(f,l)=>{if(l===0)return f;const g=Math.abs(l),xt=g>t.length?g%t.length:g;return C(0,xt-1).reduce(q=>l>0?a(q):d(q),f)}}},w=t=>{if(!t||t.length===0)return"";const e=t.toLowerCase();return e.substring(0,1).toUpperCase()+e.substring(1,e.length)},Xt=t=>{const e=t?.replace(/([A-Z])+/g,w)?.split(/(?=[A-Z])|[\.\-\s_]/).map(n=>n.toLowerCase())??[];return e.length===0?"":e.length===1?e[0]:e.reduce((n,r)=>`${n}${r.charAt(0).toUpperCase()}${r.slice(1)}`)},Yt=t=>{const e=t?.replace(/([A-Z])+/g,w).split(/(?=[A-Z])|[\.\-\s_]/).map(n=>n.toLowerCase())??[];return e.length===0?"":e.length===1?e[0]:e.reduce((n,r)=>`${n}_${r.toLowerCase()}`)},Gt=t=>{const e=t?.replace(/([A-Z])+/g,w)?.split(/(?=[A-Z])|[\.\-\s_]/).map(n=>n.toLowerCase())??[];return e.length===0?"":e.length===1?e[0]:e.reduce((n,r)=>`${n}-${r.toLowerCase()}`)},Ht=t=>{const e=t?.split(/[\.\-\s_]/).map(n=>n.toLowerCase())??[];return e.length===0?"":e.map(n=>n.charAt(0).toUpperCase()+n.slice(1)).join("")},Qt=t=>t?t.split(/(?=[A-Z])|[\.\-\s_]/).map(e=>e.trim()).filter(e=>!!e).map(e=>w(e.toLowerCase())).join(" "):"",Vt=(t,e,n=/\{\{(.+?)\}\}/g)=>Array.from(t.matchAll(n)).reduce((r,s)=>r.replace(s[0],e[s[1]]),t),vt=(t,e=" ")=>{if(!t)return"";const n=new RegExp(`^[${e}]+|[${e}]+$`,"g");return t.replace(n,"")};return u.alphabetical=v,u.assign=Z,u.boil=O,u.callable=Pt,u.camel=Xt,u.capitalize=w,u.chain=kt,u.clone=D,u.cluster=st,u.compose=Ot,u.construct=qt,u.counting=x,u.crush=It,u.dash=Gt,u.debounce=_t,u.defer=wt,u.diff=dt,u.draw=Ut,u.first=Q,u.flat=ct,u.fork=B,u.get=F,u.group=X,u.intersects=it,u.invert=Lt,u.isArray=b,u.isDate=P,u.isEmpty=W,u.isEqual=S,u.isFloat=J,u.isFunction=p,u.isInt=K,u.isNumber=h,u.isObject=k,u.isPrimitive=z,u.isString=U,u.isSymbol=_,u.iterate=L,u.keys=I,u.last=V,u.list=C,u.listify=Ft,u.lowerize=Mt,u.map=mt,u.mapEntries=Bt,u.mapKeys=$,u.mapValues=Tt,u.max=nt,u.memo=Nt,u.merge=ot,u.min=rt,u.objectify=T,u.omit=Zt,u.parallel=pt,u.partial=At,u.partob=Ct,u.pascal=Ht,u.pick=Rt,u.proxied=Et,u.random=N,u.range=A,u.reduce=ht,u.replace=tt,u.replaceOrAppend=ft,u.retry=bt,u.select=et,u.series=Wt,u.set=R,u.shake=jt,u.shift=gt,u.shuffle=Kt,u.sift=at,u.sleep=E,u.snake=Yt,u.sort=j,u.sum=H,u.template=Vt,u.throttle=zt,u.title=Qt,u.toFloat=St,u.toInt=M,u.toggle=lt,u.trim=vt,u.try=m,u.tryit=m,u.uid=Jt,u.unique=ut,u.upperize=Dt,u.zip=Y,u.zipToObject=G,u}({}); diff --git a/package.json b/package.json index 9df16018..14922641 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "radash", - "version": "10.7.0", + "version": "10.7.1", "description": "Functional utility library - modern, simple, typed, powerful", "main": "dist/cjs/index.cjs", "module": "dist/esm/index.mjs", diff --git a/src/async.ts b/src/async.ts index 29e67c3a..70be8ee8 100644 --- a/src/async.ts +++ b/src/async.ts @@ -72,7 +72,7 @@ export const defer = async ( const [err, response] = await tryit(func)(register) for (const { fn, rethrow } of callbacks) { const [rethrown] = await tryit(fn)(err) - if (rethrow) throw rethrown + if (rethrown && rethrow) throw rethrown } if (err) throw err return response