@flemist/test-variants 2.0.4 → 2.0.5

package/dist/bundle/browser.js

@@ -233,7 +233,7 @@ throwIfAborted(){if(this.aborted)throw this.reason
 }}class I{constructor(){this.signal=new O}
 abort(t){
 this.signal.aborted||(void 0===t&&((t=new T("Aborted with no reason",t))._internal=!0),
-this.signal.abort(t))}}function M(t,e){
+this.signal.abort(t))}}function F(t,e){
 var n=0,r=null;function s(t,s,i){
 return c(this,void 0,void 0,function(){var o
 ;return l(this,function(c){switch(c.label){case 0:
@@ -254,7 +254,7 @@ return s(t,e,n)});return"number"==typeof i?{
 iterationsAsync:0,iterationsSync:i
 }:null!==i&&"object"==typeof i?i:{
 iterationsAsync:0,iterationsSync:1}}catch(t){
-return s(t,e,n)}}}class F{constructor(t,e){
+return s(t,e,n)}}}class M{constructor(t,e){
 this._branch=null,this.order=t,this.parent=e}
 get branch(){if(!this._branch){
 const t=[this.order];let e=this.parent
@@ -388,7 +388,7 @@ constructor(){this._queue=new _({lessThanFunc:L})}
 run(t,e,n){return this._run(!1,t,e,n)}
 runTask(t,e,n){return this._run(!0,t,e,n)}
 _run(t,e,n,r){const s=new W(r),i={
-priority:(o=Q++,c=n,null==o?null==c?null:c:new F(o,c)),
+priority:(o=Q++,c=n,null==o?null==c?null:c:new M(o,c)),
 func:e,abortSignal:r,resolve:s.resolve,
 reject:s.reject,readyToRun:!t};var o,c
 ;if(this._queue.add(i),t){const t=this;return{
@@ -444,71 +444,77 @@ for(;t>this._size;)yield this.tick(n),yield r(e,n)
 if(null==t||t<=0)throw new Error("Iterations = ".concat(t))
 ;t--;var e=new Promise(function(e){
 setTimeout(function(){e(t)},1)})
-;return t<=0?e:e.then(Y)}function Z(t,e,n){
-var r,s,d,v,_,y,b,p,m
+;return t<=0?e:e.then(Y)}function Z(t){var e=t/1e3
+;if(e<60)return"".concat(e.toFixed(1),"s")
+;var n=e/60
+;return n<60?"".concat(n.toFixed(1),"m"):"".concat((n/60).toFixed(1),"h")
+}function tt(t,e,n){var r,s,d,v,_,y,b,p,m
 ;return void 0===n&&(n={}),c(this,void 0,void 0,function(){
 function w(){
-return null!=U&&null!=Q?Math.min(U,Q.index):null!=U?U:null!=Q?Q.index:null
+return null!=U&&null!=tt?Math.min(U,tt.index):null!=U?U:null!=tt?tt.index:null
 }function j(){
 return c(this,void 0,void 0,function(){
 var n,r=this;return l(this,function(s){
 switch(s.label){case 0:n=function(){
-var e,n,s,i,a,u,h,d,v;return l(this,function(_){
-switch(_.label){case 0:return e=K,n=o(o({},H),{
-seed:L
-}),s=(R||V)&&Date.now(),R&&s-ot>=R&&(i="",$?(i+="cycle: ".concat(q,", variant: ").concat(K),
-q>0&&null!=(a=w())&&(null!=W&&W<a&&(a=W),
-i+="/".concat(a))):i+="variant: ".concat(K),
-i+=", total: ".concat(st),console.log(i),
-ot=s),D&&st-lt>=D||C&&it-at>=C||V&&s-ct>=V?(lt=st,
-at=it,ct=s,[4,Y(1)]):[3,2];case 1:
-_.sent(),_.label=2;case 2:
+var e,n,s,i,a,u,h,d,v,_,y,b
+;return l(this,function(p){switch(p.label){case 0:
+return e=et,n=o(o({},nt),{seed:H
+}),s=(R||V)&&Date.now(),R&&s-ut>=R&&(i="",a=s-K,
+u=s-Q,$?(i+="cycle: ".concat(B,", variant: ").concat(et),
+null!=(h=w())&&null!=W&&W<h&&(h=W),
+null!=h&&et>0?(d=void 0,d=null!=q&&null!=W&&et<W&&a<q?a+(h-et)*((q-a)/(W-et)):a*h/et,
+i+="/".concat(h," (").concat(Z(a),"/").concat(Z(d),")")):i+=" (".concat(Z(a),")")):i+="variant: ".concat(et," (").concat(Z(a),")"),
+i+=", total: ".concat(lt," (").concat(Z(u),")"),
+console.log(i),ut=s),D&&lt-ft>=D||C&&at-dt>=C||V&&s-ht>=V?(ft=lt,
+dt=at,ht=s,[4,Y(1)]):[3,2];case 1:
+p.sent(),p.label=2;case 2:
 if(null==N?void 0:N.aborted)return[2,"continue"]
-;if(ut&&!et.aborted)return[3,10];_.label=3;case 3:
-return _.trys.push([3,6,,9]),g(u=t(n,e,et))?[4,u]:[3,5]
-;case 4:u=_.sent(),_.label=5;case 5:
-return u?(h=u.iterationsAsync,d=u.iterationsSync,
-it+=h,st+=d+h,[3,9]):(rt=!0,tt.abort(),
+;if(vt&&!it.aborted)return[3,10];p.label=3;case 3:
+return p.trys.push([3,6,,9]),g(v=t(n,e,it))?[4,v]:[3,5]
+;case 4:v=p.sent(),p.label=5;case 5:
+return v?(_=v.iterationsAsync,y=v.iterationsSync,
+at+=_,lt+=y+_,[3,9]):(ct=!0,st.abort(),
 [2,"continue"]);case 6:
-return v=_.sent(),P?[4,f(n,P,S.argsToJson)]:[3,8]
-;case 7:_.sent(),_.label=8;case 8:if(!$)throw v
-;return Q={error:v,args:n,index:e},rt=!1,[3,9]
+return b=p.sent(),P?[4,f(n,P,S.argsToJson)]:[3,8]
+;case 7:p.sent(),p.label=8;case 8:if(!$)throw b
+;return tt={error:b,args:n,index:e},ct=!1,[3,9]
 ;case 9:return[3,13];case 10:
-return ut.hold(1)?[3,12]:[4,ut.holdWait(1)]
-;case 11:_.sent(),_.label=12;case 12:
+return vt.hold(1)?[3,12]:[4,vt.holdWait(1)]
+;case 11:p.sent(),p.label=12;case 12:
 c(r,void 0,void 0,function(){var r,s,i,o
 ;return l(this,function(c){switch(c.label){case 0:
 return c.trys.push([0,3,6,7]),
-(null==et?void 0:et.aborted)?[2]:g(r=t(n,e,et))?[4,r]:[3,2]
+(null==it?void 0:it.aborted)?[2]:g(r=t(n,e,it))?[4,r]:[3,2]
 ;case 1:r=c.sent(),c.label=2;case 2:
 return r?(s=r.iterationsAsync,i=r.iterationsSync,
-it+=s,st+=i+s,[3,7]):(rt=!0,tt.abort(),[2])
+at+=s,lt+=i+s,[3,7]):(ct=!0,st.abort(),[2])
 ;case 3:
 return o=c.sent(),P?[4,f(n,P,S.argsToJson)]:[3,5]
 ;case 4:c.sent(),c.label=5;case 5:if(!$)throw o
-;return Q={error:o,args:n,index:e},rt=!1,[3,7]
-;case 6:return ut.release(1),[7];case 7:return[2]}
-})}),_.label=13;case 13:return[2]}})},s.label=1
+;return tt={error:o,args:n,index:e},ct=!1,[3,7]
+;case 6:return vt.release(1),[7];case 7:return[2]}
+})}),p.label=13;case 13:return[2]}})},s.label=1
 ;case 1:
-return(null==N?void 0:N.aborted)||!rt&&!function(){
+return(null==N?void 0:N.aborted)||!ct&&!function(){
 for(;;){
-if($&&K>=0&&(null==Q||K<Q.index)&&++B<$.repeatsPerVariant)return L=$.getSeed({
-variantIndex:K,cycleIndex:q,repeatIndex:B,
-totalIndex:q*$.repeatsPerVariant+B}),!0
-;if(B=0,K++,$&&q>=$.cycles)return!1;var t=w()
-;if(null==t||K<t){var n=Z.next()
-;if(!n.done)return H=n.value,$&&(L=$.getSeed({
-variantIndex:K,cycleIndex:q,repeatIndex:B,
-totalIndex:q*$.repeatsPerVariant+B})),!0}
-if(!$)return!1;if(W=K,++q>=$.cycles)return!1
-;K=-1,Z=e[Symbol.iterator]()}}()?[3,3]:[5,n()]
+if($&&et>=0&&(null==tt||et<tt.index)&&++L<$.repeatsPerVariant)return H=$.getSeed({
+variantIndex:et,cycleIndex:B,repeatIndex:L,
+totalIndex:B*$.repeatsPerVariant+L}),!0
+;if(L=0,et++,$&&B>=$.cycles)return!1;var t=w()
+;if(null==t||et<t){var n=rt.next()
+;if(!n.done)return nt=n.value,$&&(H=$.getSeed({
+variantIndex:et,cycleIndex:B,repeatIndex:L,
+totalIndex:B*$.repeatsPerVariant+L})),!0}
+if(!$)return!1
+;if(W=et,q=Date.now()-K,B++,K=Date.now(),B>=$.cycles)return!1
+;et=-1,rt=e[Symbol.iterator]()}}()?[3,3]:[5,n()]
 ;case 2:return s.sent(),[3,1];case 3:
-return ut?[4,ut.holdWait(G)]:[3,5];case 4:
-s.sent(),ut.release(G),s.label=5;case 5:
-if(null==nt?void 0:nt.aborted)throw nt.reason
-;return J&&console.log("[test-variants] variants: ".concat(K,", iterations: ").concat(st,", async: ").concat(it)),
-[4,Y(1)];case 6:return s.sent(),[2,st]}})})}
-var S,x,E,P,A,k,T,z,O,M,F,D,C,V,R,J,N,$,G,U,W,q,B,L,Q,K,H,Z,tt,et,nt,rt,st,it,ot,ct,lt,at,ut,ht,ft
+return vt?[4,vt.holdWait(G)]:[3,5];case 4:
+s.sent(),vt.release(G),s.label=5;case 5:
+if(null==ot?void 0:ot.aborted)throw ot.reason
+;return J&&console.log("[test-variants] variants: ".concat(et,", iterations: ").concat(lt,", async: ").concat(at)),
+[4,Y(1)];case 6:return s.sent(),[2,lt]}})})}
+var S,x,E,P,A,k,T,z,O,F,M,D,C,V,R,J,N,$,G,U,W,q,B,L,Q,K,H,tt,et,nt,rt,st,it,ot,ct,lt,at,ut,ht,ft,dt,vt,_t,yt
 ;return l(this,function(o){switch(o.label){case 0:
 return S=n.saveErrorVariants,x=null!==(r=null==S?void 0:S.retriesPerVariant)&&void 0!==r?r:1,
 E=new Date,
@@ -527,13 +533,13 @@ value:t&&t[r++],done:!t}}}
 }(A),T=k.next(),o.label=3;case 3:
 return T.done?[3,9]:[4,u(T.value,S.jsonToArgs)]
 ;case 4:z=o.sent(),O=0,o.label=5;case 5:
-return O<x?g(M=t(z,-1,null))?[4,M]:[3,7]:[3,8]
+return O<x?g(F=t(z,-1,null))?[4,F]:[3,7]:[3,8]
 ;case 6:o.sent(),o.label=7;case 7:return O++,[3,5]
 ;case 8:return T=k.next(),[3,3];case 9:
-return[3,12];case 10:return F=o.sent(),ht={error:F
+return[3,12];case 10:return M=o.sent(),_t={error:M
 },[3,12];case 11:try{
-T&&!T.done&&(ft=k.return)&&ft.call(k)}finally{
-if(ht)throw ht.error}return[7];case 12:
+T&&!T.done&&(yt=k.return)&&yt.call(k)}finally{
+if(_t)throw _t.error}return[7];case 12:
 return D=null!==(v=n.GC_Iterations)&&void 0!==v?v:1e6,
 C=null!==(_=n.GC_IterationsAsync)&&void 0!==_?_:1e4,
 V=null!==(y=n.GC_Interval)&&void 0!==y?y:1e3,
@@ -541,21 +547,22 @@ R=null!==(b=n.logInterval)&&void 0!==b?b:5e3,
 J=null===(p=n.logCompleted)||void 0===p||p,
 N=n.abortSignal,$=n.findBestError,G=!0===n.parallel?Math.pow(2,31):!n.parallel||n.parallel<=0?1:n.parallel,
 U=null!==(m=n.limitVariantsCount)&&void 0!==m?m:null,
-W=null,q=0,B=0,L=void 0,Q=null,
-K=-1,H={},Z=e[Symbol.iterator](),tt=new I,et=function(...t){
-let e,n;function r(t){e.abort(t)}
-for(let s=0;s<t.length;s++){const i=t[s];if(i){
-if(i.aborted)return i
+W=null,q=null,B=0,L=0,Q=Date.now(),
+K=Q,H=void 0,tt=null,et=-1,nt={},rt=e[Symbol.iterator](),
+st=new I,it=function(...t){let e,n;function r(t){
+e.abort(t)}for(let s=0;s<t.length;s++){
+const i=t[s];if(i){if(i.aborted)return i
 ;n?(e||(e=new I,n.subscribe(r)),i.subscribe(r)):n=i
 }}return e?e.signal:n||(new I).signal
-}(N,tt.signal),nt=et,rt=!1,st=0,it=0,ot=Date.now(),
-ct=ot,lt=st,at=it,ut=G<=1?null:new X(G),[4,j()]
-;case 13:return[2,{iterations:o.sent(),bestError:Q
-}]}})})}t.createTestVariants=function(t){
+}(N,st.signal),ot=it,ct=!1,lt=0,at=0,ut=Date.now(),
+ht=ut,ft=lt,dt=at,vt=G<=1?null:new X(G),[4,j()]
+;case 13:return[2,{iterations:o.sent(),
+bestError:tt}]}})})}
+t.createTestVariants=function(t){
 return function(e){return function(n){
 return c(this,void 0,void 0,function(){var r,s
-;return l(this,function(i){return r=M(t,{
+;return l(this,function(i){return r=F(t,{
 onError:null==n?void 0:n.onError}),s=d({
-argsTemplates:e}),[2,Z(r,s,n)]})})}}
+argsTemplates:e}),[2,tt(r,s,n)]})})}}
 },t.generateErrorVariantFilePath=h,Object.defineProperty(t,"__esModule",{
 value:!0})}({},fs,path);

package/dist/lib/test-variants/testVariantsRun.cjs

@@ -31,6 +31,18 @@ function _interopNamespace(e) {
 
 var path__namespace = /*#__PURE__*/_interopNamespace(path);
 
+function formatDuration(ms) {
+    const seconds = ms / 1000;
+    if (seconds < 60) {
+        return `${seconds.toFixed(1)}s`;
+    }
+    const minutes = seconds / 60;
+    if (minutes < 60) {
+        return `${minutes.toFixed(1)}m`;
+    }
+    const hours = minutes / 60;
+    return `${hours.toFixed(1)}h`;
+}
 function testVariantsRun(testRun, variants, options = {}) {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j;
     return tslib.__awaiter(this, void 0, void 0, function* () {
@@ -67,8 +79,11 @@ function testVariantsRun(testRun, variants, options = {}) {
                 : options.parallel;
         const limitVariantsCount = (_j = options.limitVariantsCount) !== null && _j !== void 0 ? _j : null;
         let prevCycleVariantsCount = null;
+        let prevCycleDuration = null;
         let cycleIndex = 0;
         let repeatIndex = 0;
+        const startTime = Date.now();
+        let cycleStartTime = startTime;
         let seed = void 0;
         let bestError = null;
         let index = -1;
@@ -126,7 +141,9 @@ function testVariantsRun(testRun, variants, options = {}) {
                     return false;
                 }
                 prevCycleVariantsCount = index;
+                prevCycleDuration = Date.now() - cycleStartTime;
                 cycleIndex++;
+                cycleStartTime = Date.now();
                 if (cycleIndex >= findBestError.cycles) {
                     return false;
                 }
@@ -161,22 +178,39 @@ function testVariantsRun(testRun, variants, options = {}) {
                     if (logInterval && now - prevLogTime >= logInterval) {
                         // the log is required to prevent the karma browserNoActivityTimeout
                         let log = '';
+                        const cycleElapsed = now - cycleStartTime;
+                        const totalElapsed = now - startTime;
                         if (findBestError) {
                             log += `cycle: ${cycleIndex}, variant: ${index}`;
-                            if (cycleIndex > 0) {
-                                let max = getLimitVariantsCount();
-                                if (max != null) {
-                                    if (prevCycleVariantsCount != null && prevCycleVariantsCount < max) {
-                                        max = prevCycleVariantsCount;
-                                    }
-                                    log += `/${max}`;
+                            let max = getLimitVariantsCount();
+                            if (max != null) {
+                                if (prevCycleVariantsCount != null && prevCycleVariantsCount < max) {
+                                    max = prevCycleVariantsCount;
+                                }
+                            }
+                            if (max != null && index > 0) {
+                                let estimatedCycleTime;
+                                if (prevCycleDuration != null && prevCycleVariantsCount != null
+                                    && index < prevCycleVariantsCount && cycleElapsed < prevCycleDuration) {
+                                    const adjustedDuration = prevCycleDuration - cycleElapsed;
+                                    const adjustedCount = prevCycleVariantsCount - index;
+                                    const speedForRemaining = adjustedDuration / adjustedCount;
+                                    const remainingTime = (max - index) * speedForRemaining;
+                                    estimatedCycleTime = cycleElapsed + remainingTime;
                                 }
+                                else {
+                                    estimatedCycleTime = cycleElapsed * max / index;
+                                }
+                                log += `/${max} (${formatDuration(cycleElapsed)}/${formatDuration(estimatedCycleTime)})`;
+                            }
+                            else {
+                                log += ` (${formatDuration(cycleElapsed)})`;
                             }
                         }
                         else {
-                            log += `variant: ${index}`;
+                            log += `variant: ${index} (${formatDuration(cycleElapsed)})`;
                         }
-                        log += `, total: ${iterations}`;
+                        log += `, total: ${iterations} (${formatDuration(totalElapsed)})`;
                         console.log(log);
                         prevLogTime = now;
                     }

package/dist/lib/test-variants/testVariantsRun.mjs

@@ -7,6 +7,18 @@ import { generateErrorVariantFilePath, readErrorVariantFiles, parseErrorVariantF
 import * as path from 'path';
 import 'fs';
 
+function formatDuration(ms) {
+    const seconds = ms / 1000;
+    if (seconds < 60) {
+        return `${seconds.toFixed(1)}s`;
+    }
+    const minutes = seconds / 60;
+    if (minutes < 60) {
+        return `${minutes.toFixed(1)}m`;
+    }
+    const hours = minutes / 60;
+    return `${hours.toFixed(1)}h`;
+}
 function testVariantsRun(testRun, variants, options = {}) {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j;
     return __awaiter(this, void 0, void 0, function* () {
@@ -43,8 +55,11 @@ function testVariantsRun(testRun, variants, options = {}) {
                 : options.parallel;
         const limitVariantsCount = (_j = options.limitVariantsCount) !== null && _j !== void 0 ? _j : null;
         let prevCycleVariantsCount = null;
+        let prevCycleDuration = null;
         let cycleIndex = 0;
         let repeatIndex = 0;
+        const startTime = Date.now();
+        let cycleStartTime = startTime;
         let seed = void 0;
         let bestError = null;
         let index = -1;
@@ -102,7 +117,9 @@ function testVariantsRun(testRun, variants, options = {}) {
                     return false;
                 }
                 prevCycleVariantsCount = index;
+                prevCycleDuration = Date.now() - cycleStartTime;
                 cycleIndex++;
+                cycleStartTime = Date.now();
                 if (cycleIndex >= findBestError.cycles) {
                     return false;
                 }
@@ -137,22 +154,39 @@ function testVariantsRun(testRun, variants, options = {}) {
                     if (logInterval && now - prevLogTime >= logInterval) {
                         // the log is required to prevent the karma browserNoActivityTimeout
                         let log = '';
+                        const cycleElapsed = now - cycleStartTime;
+                        const totalElapsed = now - startTime;
                         if (findBestError) {
                             log += `cycle: ${cycleIndex}, variant: ${index}`;
-                            if (cycleIndex > 0) {
-                                let max = getLimitVariantsCount();
-                                if (max != null) {
-                                    if (prevCycleVariantsCount != null && prevCycleVariantsCount < max) {
-                                        max = prevCycleVariantsCount;
-                                    }
-                                    log += `/${max}`;
+                            let max = getLimitVariantsCount();
+                            if (max != null) {
+                                if (prevCycleVariantsCount != null && prevCycleVariantsCount < max) {
+                                    max = prevCycleVariantsCount;
+                                }
+                            }
+                            if (max != null && index > 0) {
+                                let estimatedCycleTime;
+                                if (prevCycleDuration != null && prevCycleVariantsCount != null
+                                    && index < prevCycleVariantsCount && cycleElapsed < prevCycleDuration) {
+                                    const adjustedDuration = prevCycleDuration - cycleElapsed;
+                                    const adjustedCount = prevCycleVariantsCount - index;
+                                    const speedForRemaining = adjustedDuration / adjustedCount;
+                                    const remainingTime = (max - index) * speedForRemaining;
+                                    estimatedCycleTime = cycleElapsed + remainingTime;
                                 }
+                                else {
+                                    estimatedCycleTime = cycleElapsed * max / index;
+                                }
+                                log += `/${max} (${formatDuration(cycleElapsed)}/${formatDuration(estimatedCycleTime)})`;
+                            }
+                            else {
+                                log += ` (${formatDuration(cycleElapsed)})`;
                             }
                         }
                         else {
-                            log += `variant: ${index}`;
+                            log += `variant: ${index} (${formatDuration(cycleElapsed)})`;
                         }
-                        log += `, total: ${iterations}`;
+                        log += `, total: ${iterations} (${formatDuration(totalElapsed)})`;
                         console.log(log);
                         prevLogTime = now;
                     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flemist/test-variants",
-  "version": "2.0.4",
+  "version": "2.0.5",
   "description": "Runs a test function with all possible combinations of its parameters.",
   "main": "dist/lib/index.cjs",
   "module": "dist/lib/index.mjs",