From c3c9dac9c5da8102a8c62b1afbbb7efb9c64c31e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ng=C3=B4=20=C4=90=E1=BB=A9c=20Anh?= <75556609+DuCanhGH@users.noreply.github.com> Date: Tue, 27 Jun 2023 20:33:07 +0700 Subject: [PATCH] types: fixed tryit function argument types (#296) --- .npmignore | 3 --- cdn/radash.esm.js | 7 +------ cdn/radash.js | 7 +------ cdn/radash.min.js | 2 +- package.json | 2 +- src/async.ts | 19 +++++++------------ src/curry.ts | 11 +++-------- src/object.ts | 2 +- src/tests/curry.test.ts | 2 +- 9 files changed, 16 insertions(+), 39 deletions(-) delete mode 100644 .npmignore diff --git a/.npmignore b/.npmignore deleted file mode 100644 index 1d33cdc2..00000000 --- a/.npmignore +++ /dev/null @@ -1,3 +0,0 @@ -src -tsconfig.json -tslint.json \ No newline at end of file diff --git a/cdn/radash.esm.js b/cdn/radash.esm.js index 793e48bd..139a6001 100644 --- a/cdn/radash.esm.js +++ b/cdn/radash.esm.js @@ -519,12 +519,7 @@ const memoize = (cache, func, keyFunc, ttl) => { }; }; const memo = (func, options = {}) => { - return memoize( - {}, - func, - options.key ?? null, - options.ttl ?? null - ); + return memoize({}, func, options.key ?? null, options.ttl ?? null); }; const debounce = ({ delay }, func) => { let timer = void 0; diff --git a/cdn/radash.js b/cdn/radash.js index 1d438c81..d35ea8ee 100644 --- a/cdn/radash.js +++ b/cdn/radash.js @@ -522,12 +522,7 @@ var radash = (function (exports) { }; }; const memo = (func, options = {}) => { - return memoize( - {}, - func, - options.key ?? null, - options.ttl ?? null - ); + return memoize({}, func, options.key ?? null, options.ttl ?? null); }; const debounce = ({ delay }, func) => { let timer = void 0; diff --git a/cdn/radash.min.js b/cdn/radash.min.js index d92538e3..c381221d 100644 --- a/cdn/radash.min.js +++ b/cdn/radash.min.js @@ -1 +1 @@ -var radash=function(u){"use strict";const N=t=>!!t&&t.constructor===Symbol,b=t=>!!t&&t.constructor===Array,k=t=>!!t&&t.constructor===Object,P=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}},j=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(j(t))return isNaN(t.getTime());if(p(t)||N(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},z=(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 H(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),Q=(t,e)=>(t||[]).reduce((n,r)=>n+(e?e(r):r),0),V=(t,e=void 0)=>t?.length>0?t[0]:e,G=(t,e=void 0)=>t?.length>0?t[t.length-1]:e,S=(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(S(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)=>{const n=s=>{if(e&&!e(s))throw s},r=s=>s instanceof Promise;try{const s=t();return r(s)?s.catch(n):s}catch(s){return n(s)}},Ot=(...t)=>(...e)=>t.slice(1).reduce((n,r)=>r(n),t[0](...e)),At=(...t)=>t.reverse().reduce((e,n)=>n(e)),Ct=(t,...e)=>(...n)=>t(...e,...n),Et=(t,e)=>n=>t({...e,...n}),_t=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),Pt=({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},jt=({interval:t},e)=>{let n=!0;return(...s)=>{n&&(e(...s),n=!1,setTimeout(()=>{n=!0},t))}},zt=(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},Tt=(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),{}),Bt=(t,e)=>Object.keys(t).reduce((r,s)=>(r[s]=e(t[s],s),r),{}),Lt=(t,e)=>t?Object.entries(t).reduce((n,[r,s])=>{const[c,i]=e(r,s);return n[c]=i,n},{}):{},Mt=t=>t?Object.keys(t).reduce((n,r)=>(n[t[r]]=r,n),{}):{},Dt=t=>_(t,e=>e.toLowerCase()),Ft=t=>_(t,e=>e.toUpperCase()),D=t=>{if(P(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},Rt=(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),[])},Zt=(t,e)=>t?e.reduce((n,r)=>(Object.prototype.hasOwnProperty.call(t,r)&&(n[r]=t[r]),n),{}):{},It=(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,[])},qt=t=>t?T(I(t),e=>e,e=>F(t,e)):{},Ut=t=>t?Object.keys(t).reduce((e,n)=>R(e,n,t[n]),{}):{},$=(t,e)=>Math.floor(Math.random()*(e-t+1)+t),Kt=t=>{const e=t.length;if(e===0)return null;const n=$(0,e-1);return t[n]},Jt=t=>t.map(e=>({rand:Math.random(),value:e})).sort((e,n)=>e.rand-n.rand).map(e=>e.value),Wt=(t,e="")=>{const n="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"+e;return L(t,r=>r+n.charAt($(0,n.length-1)),"")},Xt=(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),te=g>t.length?g%t.length:g;return C(0,te-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)},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.charAt(0).toUpperCase()}${r.slice(1)}`)},Ht=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()}`)},Qt=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()}`)},Vt=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("")},Gt=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),xt=(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=zt,u.camel=Yt,u.capitalize=w,u.chain=Ot,u.clone=D,u.cluster=st,u.compose=At,u.construct=Ut,u.counting=x,u.crush=qt,u.dash=Qt,u.debounce=Pt,u.defer=wt,u.diff=dt,u.draw=Kt,u.first=V,u.flat=ct,u.fork=B,u.get=F,u.group=X,u.guard=kt,u.intersects=it,u.invert=Mt,u.isArray=b,u.isDate=j,u.isEmpty=W,u.isEqual=z,u.isFloat=J,u.isFunction=p,u.isInt=K,u.isNumber=h,u.isObject=k,u.isPrimitive=P,u.isString=U,u.isSymbol=N,u.iterate=L,u.keys=I,u.last=G,u.list=C,u.listify=Rt,u.lowerize=Dt,u.map=mt,u.mapEntries=Lt,u.mapKeys=_,u.mapValues=Bt,u.max=nt,u.memo=Nt,u.merge=ot,u.min=rt,u.objectify=T,u.omit=It,u.parallel=pt,u.partial=Ct,u.partob=Et,u.pascal=Vt,u.pick=Zt,u.proxied=_t,u.random=$,u.range=A,u.reduce=ht,u.replace=tt,u.replaceOrAppend=ft,u.retry=bt,u.select=et,u.series=Xt,u.set=R,u.shake=Tt,u.shift=gt,u.shuffle=Jt,u.sift=at,u.sleep=E,u.snake=Ht,u.sort=S,u.sum=Q,u.template=vt,u.throttle=jt,u.title=Gt,u.toFloat=St,u.toInt=M,u.toggle=lt,u.trim=xt,u.try=m,u.tryit=m,u.uid=Wt,u.unique=ut,u.upperize=Ft,u.zip=Y,u.zipToObject=H,u}({}); \ No newline at end of file +var radash=function(u){"use strict";const N=t=>!!t&&t.constructor===Symbol,w=Array.isArray,k=t=>!!t&&t.constructor===Object,P=t=>t==null||typeof t!="object"&&typeof t!="function",b=t=>!!(t&&t.constructor&&t.call&&t.apply),U=t=>typeof t=="string"||t instanceof String,K=t=>h(t)&&t%1===0,W=t=>h(t)&&t%1!==0,h=t=>{try{return Number(t)===t}catch{return!1}},T=t=>Object.prototype.toString.call(t)==="[object Date]",J=t=>{if(t===!0||t===!1||t==null)return!0;if(h(t))return t===0;if(T(t))return isNaN(t.getTime());if(b(t)||N(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},j=(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 H(t,e){if(!t||!t.length)return{};const n=b(e)?e:w(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),Q=(t,e)=>(t||[]).reduce((n,r)=>n+(e?e(r):r),0),V=(t,e=void 0)=>t?.length>0?t[0]:e,G=(t,e=void 0)=>t?.length>0?t[t.length-1]:e,z=(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)},x=(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)},tt=(t,e)=>t?t.reduce((n,r)=>{const s=e(r);return n[s]=(n[s]??0)+1,n},{}):{},et=(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),{}),nt=(t,e,n)=>t?t.reduce((r,s,c)=>(n(s,c)&&r.push(e(s,c)),r),[]):[],rt=(t,e)=>{const n=e||(r=>r);return O(t,(r,s)=>n(r)>n(s)?r:s)},st=(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))},ct=(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=b(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)),it=t=>t.reduce((e,n)=>(e.push(...n),e),[]),ot=(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]]},[[],[]]):[[],[]],lt=(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]},dt=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},gt=(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 ht(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 mt=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,o]of s.entries())c=await e(c,o,i);return c},wt=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},yt=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 M 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,p)=>({index:p,item:d})),s=async d=>{const p=[];for(;;){const l=r.pop();if(!l)return d(p);const[f,g]=await m(n)(l.item);p.push({error:f,result:g,index:l.index})}},c=C(1,t).map(()=>new Promise(s)),i=await Promise.all(c),[o,a]=B(z(i.flat(),d=>d.index),d=>!!d.error);if(o.length>0)throw new M(o.map(d=>d.error));return a.map(d=>d.result)};async function bt(t){const e=w(t)?t.map(s=>[null,s]):Object.entries(t),n=await Promise.all(e.map(([s,c])=>c.then(i=>({result:i,exc:null,key:s})).catch(i=>({result:null,exc:i,key:s})))),r=n.filter(s=>s.exc);if(r.length>0)throw new M(r.map(s=>s.exc));return w(t)?n.map(s=>s.result):n.reduce((s,c)=>({...s,[c.key]:c.result}),{})}const kt=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 $(r),s&&await $(s(c))}},$=t=>new Promise(e=>setTimeout(e,t)),m=t=>async(...e)=>{try{return[void 0,await t(...e)]}catch(n){return[n,void 0]}},Ot=(t,e)=>{const n=s=>{if(e&&!e(s))throw s},r=s=>s instanceof Promise;try{const s=t();return r(s)?s.catch(n):s}catch(s){return n(s)}},At=(...t)=>(...e)=>t.slice(1).reduce((n,r)=>r(n),t[0](...e)),Ct=(...t)=>t.reverse().reduce((e,n)=>n(e)),$t=(t,...e)=>(...n)=>t(...e,...n),Et=(t,e)=>n=>t({...e,...n}),_t=t=>new Proxy({},{get:(e,n)=>t(n)}),Nt=(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},Pt=(t,e={})=>Nt({},t,e.key??null,e.ttl??null),Tt=({delay:t},e)=>{let n,r=!0;const s=(...c)=>{r?(clearTimeout(n),n=setTimeout(()=>{r&&e(...c),n=void 0},t)):e(...c)};return s.isPending=()=>n!==void 0,s.cancel=()=>{r=!1},s.flush=(...c)=>e(...c),s},jt=({interval:t},e)=>{let n=!0,r;const s=(...c)=>{n&&(e(...c),n=!1,r=setTimeout(()=>{n=!0,r=void 0},t))};return s.isThrottled=()=>r!==void 0,s},zt=(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},D=(t,e)=>{const n=e===void 0?0:e;if(t==null)return n;const r=parseInt(t);return isNaN(r)?n:r},Bt=(t,e=n=>n===void 0)=>t?Object.keys(t).reduce((r,s)=>(e(t[s])||(r[s]=t[s]),r),{}):{},E=(t,e)=>Object.keys(t).reduce((r,s)=>(r[e(s,t[s])]=t[s],r),{}),Lt=(t,e)=>Object.keys(t).reduce((r,s)=>(r[s]=e(t[s],s),r),{}),Mt=(t,e)=>t?Object.entries(t).reduce((n,[r,s])=>{const[c,i]=e(r,s);return n[c]=i,n},{}):{},Dt=t=>t?Object.keys(t).reduce((n,r)=>(n[t[r]]=r,n),{}):{},Ft=t=>E(t,e=>e.toLowerCase()),Rt=t=>E(t,e=>e.toUpperCase()),F=t=>{if(P(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},Zt=(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),[])},It=(t,e)=>t?e.reduce((n,r)=>(Object.prototype.hasOwnProperty.call(t,r)&&(n[r]=t[r]),n),{}):{},qt=(t,e)=>t?!e||e.length===0?t:e.reduce((n,r)=>(delete n[r],n),{...t}):{},R=(t,e,n)=>{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},Z=(t,e,n)=>{if(!t)return{};if(!e||n===void 0)return t;const r=e.split(/[\.\[\]]/g).filter(i=>!!i.trim()),s=i=>{if(r.length>1){const o=r.shift(),a=D(r[0],null)!==null;i[o]=i[o]===void 0?a?[]:{}:i[o],s(i[o])}else i[r[0]]=n},c=F(t);return s(c),c},I=(t,e)=>!t||!e?t??e??{}:Object.entries({...t,...e}).reduce((n,[r,s])=>({...n,[r]:(()=>k(t[r])?I(t[r],s):s)()}),{}),q=t=>{if(!t)return[];const e=(n,r)=>k(n)?Object.entries(n).flatMap(([s,c])=>e(c,[...r,s])):w(n)?n.flatMap((s,c)=>e(s,[...r,`${c}`])):[r.join(".")];return e(t,[])},vt=t=>t?S(q(t),e=>e,e=>R(t,e)):{},Ut=t=>t?Object.keys(t).reduce((e,n)=>Z(e,n,t[n]),{}):{},_=(t,e)=>Math.floor(Math.random()*(e-t+1)+t),Kt=t=>{const e=t.length;if(e===0)return null;const n=_(0,e-1);return t[n]},Wt=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(_(0,n.length-1)),"")},Xt=(t,e=n=>`${n}`)=>{const{indexesByKey:n,itemsByIndex:r}=t.reduce((l,f,g)=>({indexesByKey:{...l.indexesByKey,[e(f)]:g},itemsByIndex:{...l.itemsByIndex,[g]:f}}),{indexesByKey:{},itemsByIndex:{}}),s=(l,f)=>n[e(l)]n[e(l)]>n[e(f)]?l:f,i=()=>r[0],o=()=>r[t.length-1],a=(l,f)=>r[n[e(l)]+1]??f??i(),d=(l,f)=>r[n[e(l)]-1]??f??o();return{min:s,max:c,first:i,last:o,next:a,previous:d,spin:(l,f)=>{if(f===0)return l;const g=Math.abs(f),ee=g>t.length?g%t.length:g;return C(0,ee-1).reduce(v=>f>0?a(v):d(v),l)}}},y=t=>{if(!t||t.length===0)return"";const e=t.toLowerCase();return e.substring(0,1).toUpperCase()+e.substring(1,e.length)},Yt=t=>{const e=t?.replace(/([A-Z])+/g,y)?.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)}`)},Ht=t=>{const e=t?.replace(/([A-Z])+/g,y).split(/(?=[A-Z])|[\.\-\s_]/).map(n=>n.toLowerCase())??[];return e.length===0?"":e.length===1?e[0]:e.reduce((n,r)=>`${n}_${r.toLowerCase()}`)},Qt=t=>{const e=t?.replace(/([A-Z])+/g,y)?.split(/(?=[A-Z])|[\.\-\s_]/).map(n=>n.toLowerCase())??[];return e.length===0?"":e.length===1?e[0]:e.reduce((n,r)=>`${n}-${r.toLowerCase()}`)},Vt=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("")},Gt=t=>t?t.split(/(?=[A-Z])|[\.\-\s_]/).map(e=>e.trim()).filter(e=>!!e).map(e=>y(e.toLowerCase())).join(" "):"",xt=(t,e,n=/\{\{(.+?)\}\}/g)=>Array.from(t.matchAll(n)).reduce((r,s)=>r.replace(s[0],e[s[1]]),t),te=(t,e=" ")=>{if(!t)return"";const n=e.replace(/[\W]{1}/g,"\\$&"),r=new RegExp(`^[${n}]+|[${n}]+$`,"g");return t.replace(r,"")};return u.all=bt,u.alphabetical=x,u.assign=I,u.boil=O,u.callable=zt,u.camel=Yt,u.capitalize=y,u.chain=At,u.clone=F,u.cluster=ut,u.compose=Ct,u.construct=Ut,u.counting=tt,u.crush=vt,u.dash=Qt,u.debounce=Tt,u.defer=yt,u.diff=gt,u.draw=Kt,u.first=V,u.flat=it,u.fork=B,u.get=R,u.group=X,u.guard=Ot,u.intersects=ot,u.invert=Dt,u.isArray=w,u.isDate=T,u.isEmpty=J,u.isEqual=j,u.isFloat=W,u.isFunction=b,u.isInt=K,u.isNumber=h,u.isObject=k,u.isPrimitive=P,u.isString=U,u.isSymbol=N,u.iterate=L,u.keys=q,u.last=G,u.list=C,u.listify=Zt,u.lowerize=Ft,u.map=wt,u.mapEntries=Mt,u.mapKeys=E,u.mapValues=Lt,u.max=rt,u.memo=Pt,u.merge=lt,u.min=st,u.objectify=S,u.omit=qt,u.parallel=pt,u.partial=$t,u.partob=Et,u.pascal=Vt,u.pick=It,u.proxied=_t,u.random=_,u.range=A,u.reduce=mt,u.replace=et,u.replaceOrAppend=ft,u.retry=kt,u.select=nt,u.series=Xt,u.set=Z,u.shake=Bt,u.shift=ht,u.shuffle=Wt,u.sift=dt,u.sleep=$,u.snake=Ht,u.sort=z,u.sum=Q,u.template=xt,u.throttle=jt,u.title=Gt,u.toFloat=St,u.toInt=D,u.toggle=at,u.trim=te,u.try=m,u.tryit=m,u.uid=Jt,u.unique=ct,u.upperize=Rt,u.zip=Y,u.zipToObject=H,u}({}); diff --git a/package.json b/package.json index 7dfedab4..eae64609 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ }, "sideEffects": false, "files": [ - "dist/**/*" + "dist" ], "repository": { "url": "https://github.com/rayepps/radash" diff --git a/src/async.ts b/src/async.ts index 4a4f4f96..9c8a60f4 100644 --- a/src/async.ts +++ b/src/async.ts @@ -254,24 +254,19 @@ export const sleep = (milliseconds: number) => { return new Promise(res => setTimeout(res, milliseconds)) } -type ArgumentsType = T extends (...args: infer U) => any ? U : never -type UnwrapPromisify = T extends Promise ? U : T - /** * A helper to try an async function without forking * the control flow. Returns an error first callback _like_ * array response as [Error, result] */ -export const tryit = any>( - func: TFunction +export const tryit = ( + func: (...args: Args) => Return ) => { return async ( - ...args: ArgumentsType - ): Promise< - [Error, undefined] | [undefined, UnwrapPromisify>] - > => { + ...args: Args + ): Promise<[Error, undefined] | [undefined, Awaited]> => { try { - return [undefined, await func(...(args as any))] + return [undefined, await func(...args)] } catch (err) { return [err as any, undefined] } @@ -288,13 +283,13 @@ export const guard = any>( func: TFunction, shouldGuard?: (err: any) => boolean ): ReturnType extends Promise - ? Promise> | undefined> + ? Promise> | undefined> : ReturnType | undefined => { const _guard = (err: any) => { if (shouldGuard && !shouldGuard(err)) throw err return undefined as any } - const isPromise = (result: any): result is ReturnType => + const isPromise = (result: any): result is Promise => result instanceof Promise try { const result = func() diff --git a/src/curry.ts b/src/curry.ts index 08721799..7bb091be 100644 --- a/src/curry.ts +++ b/src/curry.ts @@ -80,19 +80,14 @@ const memoize = ( * is given previously computed values will be checked * for expiration before being returned. */ -export const memo = ( +export const memo = any>( func: TFunc, options: { key?: Func ttl?: number } = {} ) => { - return memoize( - {}, - func as any, - options.key ?? null, - options.ttl ?? null - ) as any as TFunc + return memoize({}, func, options.key ?? null, options.ttl ?? null) as TFunc } export type DebounceFunction = { @@ -204,7 +199,7 @@ export const throttle = ( export const callable = < TValue, TObj extends Record, - TFunc extends Function + TFunc extends (...args: any) => any >( obj: TObj, fn: (self: TObj) => TFunc diff --git a/src/object.ts b/src/object.ts index 6db1f8ab..fa481256 100644 --- a/src/object.ts +++ b/src/object.ts @@ -137,7 +137,7 @@ export const clone = (obj: T): T => { // Access the constructor and create a new object. // This method can create an array as well. - const newObj = new ((obj as Object).constructor as { new (): T })() + const newObj = new ((obj as object).constructor as { new (): T })() // Assign the props. Object.getOwnPropertyNames(obj).forEach(prop => { diff --git a/src/tests/curry.test.ts b/src/tests/curry.test.ts index 7e4664da..cf63aa37 100644 --- a/src/tests/curry.test.ts +++ b/src/tests/curry.test.ts @@ -1,6 +1,6 @@ import { assert } from 'chai' import * as _ from '..' -import { DebounceFunction } from '../curry' +import type { DebounceFunction } from '../curry' describe('curry module', () => { describe('compose function', () => {