@flemist/test-variants 2.0.2 → 2.0.4

package/dist/bundle/browser.js

@@ -448,71 +448,75 @@ setTimeout(function(){e(t)},1)})
 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
+}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;return l(this,function(v){
-switch(v.label){case 0:return e=L,n=o(o({},Q),{
-seed:q
-}),s=(V||C)&&Date.now(),V&&s-st>=V&&(i="",i+=N?"cycle: ".concat(U,", variant: ").concat(L,"/").concat(G):"variant: ".concat(L),
-i+=", total: ".concat(nt),
-console.log(i),st=s),F&&nt-ot>=F||D&&rt-ct>=D||C&&s-it>=C?(ot=nt,
-ct=rt,it=s,[4,Y(1)]):[3,2];case 1:
-v.sent(),v.label=2;case 2:
-if(null==J?void 0:J.aborted)return[2,"continue"]
-;if(lt&&!Z.aborted)return[3,10];v.label=3;case 3:
-return v.trys.push([3,6,,9]),g(a=t(n,e,Z))?[4,a]:[3,5]
-;case 4:a=v.sent(),v.label=5;case 5:
-return a?(u=a.iterationsAsync,h=a.iterationsSync,
-rt+=u,nt+=h+u,[3,9]):(et=!0,H.abort(),
+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:
+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(),
 [2,"continue"]);case 6:
-return d=v.sent(),E?[4,f(n,E,j.argsToJson)]:[3,8]
-;case 7:v.sent(),v.label=8;case 8:if(!N)throw d
-;return B={error:d,args:n,index:e},et=!1,[3,9]
+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]
 ;case 9:return[3,13];case 10:
-return lt.hold(1)?[3,12]:[4,lt.holdWait(1)]
-;case 11:v.sent(),v.label=12;case 12:
+return ut.hold(1)?[3,12]:[4,ut.holdWait(1)]
+;case 11:_.sent(),_.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==Z?void 0:Z.aborted)?[2]:g(r=t(n,e,Z))?[4,r]:[3,2]
+(null==et?void 0:et.aborted)?[2]:g(r=t(n,e,et))?[4,r]:[3,2]
 ;case 1:r=c.sent(),c.label=2;case 2:
 return r?(s=r.iterationsAsync,i=r.iterationsSync,
-rt+=s,nt+=i+s,[3,7]):(et=!0,H.abort(),[2]);case 3:
-return o=c.sent(),E?[4,f(n,E,j.argsToJson)]:[3,5]
-;case 4:c.sent(),c.label=5;case 5:if(!N)throw o
-;return B={error:o,args:n,index:e},et=!1,[3,7]
-;case 6:return lt.release(1),[7];case 7:return[2]}
-})}),v.label=13;case 13:return[2]}})},s.label=1
+it+=s,st+=i+s,[3,7]):(rt=!0,tt.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
 ;case 1:
-return(null==J?void 0:J.aborted)||!et&&!function(){
+return(null==N?void 0:N.aborted)||!rt&&!function(){
 for(;;){
-if(N&&L>=0&&(null==B||L<B.index)&&++W<N.repeatsPerVariant)return q=N.getSeed({
-variantIndex:L,cycleIndex:U,repeatIndex:W,
-totalIndex:U*N.repeatsPerVariant+W}),!0
-;if(W=0,L++,N&&U>=N.cycles)return!1
-;if((null==G||L<G)&&(null==B||L<B.index)){
-var t=K.next()
-;if(!t.done)return Q=t.value,N&&(q=N.getSeed({
-variantIndex:L,cycleIndex:U,repeatIndex:W,
-totalIndex:U*N.repeatsPerVariant+W})),!0}
-if(!N)return!1;if(++U>=N.cycles)return!1
-;L=-1,K=e[Symbol.iterator]()}}()?[3,3]:[5,n()]
+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()]
 ;case 2:return s.sent(),[3,1];case 3:
-return lt?[4,lt.holdWait($)]:[3,5];case 4:
-s.sent(),lt.release($),s.label=5;case 5:
-if(null==tt?void 0:tt.aborted)throw tt.reason
-;return R&&console.log("[test-variants] variants: ".concat(L,", iterations: ").concat(nt,", async: ").concat(rt)),
-[4,Y(1)];case 6:return s.sent(),[2,nt]}})})}
-var j,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
+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 l(this,function(o){switch(o.label){case 0:
-return j=n.saveErrorVariants,S=null!==(r=null==j?void 0:j.retriesPerVariant)&&void 0!==r?r:1,
-x=new Date,
-E=j?i.resolve(j.dir,null!==(d=null===(s=j.getFilePath)||void 0===s?void 0:s.call(j,{
-sessionDate:x}))&&void 0!==d?d:h({sessionDate:x
-})):null,j?[4,a(j.dir)]:[3,12];case 1:
-P=o.sent(),o.label=2;case 2:
-o.trys.push([2,10,11,12]),A=function(t){
+return S=n.saveErrorVariants,x=null!==(r=null==S?void 0:S.retriesPerVariant)&&void 0!==r?r:1,
+E=new Date,
+P=S?i.resolve(S.dir,null!==(d=null===(s=S.getFilePath)||void 0===s?void 0:s.call(S,{
+sessionDate:E}))&&void 0!==d?d:h({sessionDate:E
+})):null,S?[4,a(S.dir)]:[3,12];case 1:
+A=o.sent(),o.label=2;case 2:
+o.trys.push([2,10,11,12]),k=function(t){
 var e="function"==typeof Symbol&&Symbol.iterator,n=e&&t[e],r=0
 ;if(n)return n.call(t)
 ;if(t&&"number"==typeof t.length)return{
@@ -520,33 +524,33 @@ next:function(){
 return t&&r>=t.length&&(t=void 0),{
 value:t&&t[r++],done:!t}}}
 ;throw new TypeError(e?"Object is not iterable.":"Symbol.iterator is not defined.")
-}(P),k=A.next(),o.label=3;case 3:
-return k.done?[3,9]:[4,u(k.value,j.jsonToArgs)]
-;case 4:T=o.sent(),z=0,o.label=5;case 5:
-return z<S?g(O=t(T,-1,null))?[4,O]:[3,7]:[3,8]
-;case 6:o.sent(),o.label=7;case 7:return z++,[3,5]
-;case 8:return k=A.next(),[3,3];case 9:
-return[3,12];case 10:return M=o.sent(),at={error:M
+}(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]
+;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
 },[3,12];case 11:try{
-k&&!k.done&&(ut=A.return)&&ut.call(A)}finally{
-if(at)throw at.error}return[7];case 12:
-return F=null!==(v=n.GC_Iterations)&&void 0!==v?v:1e6,
-D=null!==(_=n.GC_IterationsAsync)&&void 0!==_?_:1e4,
-C=null!==(y=n.GC_Interval)&&void 0!==y?y:1e3,
-V=null!==(b=n.logInterval)&&void 0!==b?b:5e3,
-R=null===(p=n.logCompleted)||void 0===p||p,
-J=n.abortSignal,N=n.findBestError,$=!0===n.parallel?Math.pow(2,31):!n.parallel||n.parallel<=0?1:n.parallel,
-G=null!==(m=n.limitVariantsCount)&&void 0!==m?m:null,
-U=0,W=0,q=void 0,B=null,L=-1,
-Q={},K=e[Symbol.iterator](),H=new I,Z=function(...t){
+T&&!T.done&&(ft=k.return)&&ft.call(k)}finally{
+if(ht)throw ht.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,
+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
 ;n?(e||(e=new I,n.subscribe(r)),i.subscribe(r)):n=i
 }}return e?e.signal:n||(new I).signal
-}(J,H.signal),tt=Z,et=!1,nt=0,rt=0,st=Date.now(),
-it=st,ot=nt,ct=rt,lt=$<=1?null:new X($),[4,w()]
-;case 13:return[2,{iterations:o.sent(),bestError:B
+}(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){
 return function(e){return function(n){
 return c(this,void 0,void 0,function(){var r,s

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

@@ -66,6 +66,7 @@ function testVariantsRun(testRun, variants, options = {}) {
                 ? 1
                 : options.parallel;
         const limitVariantsCount = (_j = options.limitVariantsCount) !== null && _j !== void 0 ? _j : null;
+        let prevCycleVariantsCount = null;
         let cycleIndex = 0;
         let repeatIndex = 0;
         let seed = void 0;
@@ -73,6 +74,18 @@ function testVariantsRun(testRun, variants, options = {}) {
         let index = -1;
         let args = {};
         let variantsIterator = variants[Symbol.iterator]();
+        function getLimitVariantsCount() {
+            if (limitVariantsCount != null && bestError != null) {
+                return Math.min(limitVariantsCount, bestError.index);
+            }
+            if (limitVariantsCount != null) {
+                return limitVariantsCount;
+            }
+            if (bestError != null) {
+                return bestError.index;
+            }
+            return null;
+        }
         function nextVariant() {
             while (true) {
                 // Try next repeat for current variant
@@ -93,8 +106,8 @@ function testVariantsRun(testRun, variants, options = {}) {
                 if (findBestError && cycleIndex >= findBestError.cycles) {
                     return false;
                 }
-                if ((limitVariantsCount == null || index < limitVariantsCount)
-                    && (bestError == null || index < bestError.index)) {
+                const _limitVariantsCount = getLimitVariantsCount();
+                if (_limitVariantsCount == null || index < _limitVariantsCount) {
                     const result = variantsIterator.next();
                     if (!result.done) {
                         args = result.value;
@@ -112,6 +125,7 @@ function testVariantsRun(testRun, variants, options = {}) {
                 if (!findBestError) {
                     return false;
                 }
+                prevCycleVariantsCount = index;
                 cycleIndex++;
                 if (cycleIndex >= findBestError.cycles) {
                     return false;
@@ -148,7 +162,16 @@ function testVariantsRun(testRun, variants, options = {}) {
                         // the log is required to prevent the karma browserNoActivityTimeout
                         let log = '';
                         if (findBestError) {
-                            log += `cycle: ${cycleIndex}, variant: ${index}/${limitVariantsCount}`;
+                            log += `cycle: ${cycleIndex}, variant: ${index}`;
+                            if (cycleIndex > 0) {
+                                let max = getLimitVariantsCount();
+                                if (max != null) {
+                                    if (prevCycleVariantsCount != null && prevCycleVariantsCount < max) {
+                                        max = prevCycleVariantsCount;
+                                    }
+                                    log += `/${max}`;
+                                }
+                            }
                         }
                         else {
                             log += `variant: ${index}`;

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

@@ -42,6 +42,7 @@ function testVariantsRun(testRun, variants, options = {}) {
                 ? 1
                 : options.parallel;
         const limitVariantsCount = (_j = options.limitVariantsCount) !== null && _j !== void 0 ? _j : null;
+        let prevCycleVariantsCount = null;
         let cycleIndex = 0;
         let repeatIndex = 0;
         let seed = void 0;
@@ -49,6 +50,18 @@ function testVariantsRun(testRun, variants, options = {}) {
         let index = -1;
         let args = {};
         let variantsIterator = variants[Symbol.iterator]();
+        function getLimitVariantsCount() {
+            if (limitVariantsCount != null && bestError != null) {
+                return Math.min(limitVariantsCount, bestError.index);
+            }
+            if (limitVariantsCount != null) {
+                return limitVariantsCount;
+            }
+            if (bestError != null) {
+                return bestError.index;
+            }
+            return null;
+        }
         function nextVariant() {
             while (true) {
                 // Try next repeat for current variant
@@ -69,8 +82,8 @@ function testVariantsRun(testRun, variants, options = {}) {
                 if (findBestError && cycleIndex >= findBestError.cycles) {
                     return false;
                 }
-                if ((limitVariantsCount == null || index < limitVariantsCount)
-                    && (bestError == null || index < bestError.index)) {
+                const _limitVariantsCount = getLimitVariantsCount();
+                if (_limitVariantsCount == null || index < _limitVariantsCount) {
                     const result = variantsIterator.next();
                     if (!result.done) {
                         args = result.value;
@@ -88,6 +101,7 @@ function testVariantsRun(testRun, variants, options = {}) {
                 if (!findBestError) {
                     return false;
                 }
+                prevCycleVariantsCount = index;
                 cycleIndex++;
                 if (cycleIndex >= findBestError.cycles) {
                     return false;
@@ -124,7 +138,16 @@ function testVariantsRun(testRun, variants, options = {}) {
                         // the log is required to prevent the karma browserNoActivityTimeout
                         let log = '';
                         if (findBestError) {
-                            log += `cycle: ${cycleIndex}, variant: ${index}/${limitVariantsCount}`;
+                            log += `cycle: ${cycleIndex}, variant: ${index}`;
+                            if (cycleIndex > 0) {
+                                let max = getLimitVariantsCount();
+                                if (max != null) {
+                                    if (prevCycleVariantsCount != null && prevCycleVariantsCount < max) {
+                                        max = prevCycleVariantsCount;
+                                    }
+                                    log += `/${max}`;
+                                }
+                            }
                         }
                         else {
                             log += `variant: ${index}`;

package/package.json

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