@flemist/test-variants 2.0.3 → 2.0.4

package/dist/bundle/browser.js

@@ -448,65 +448,67 @@ 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!=L?Math.min(U,L.index):null!=U?U:null!=L?L.index:null
+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,v;return l(this,function(_){
-switch(_.label){case 0:return e=Q,n=o(o({},K),{
-seed:B
-}),s=(R||V)&&Date.now(),R&&s-it>=R&&(i="",$?(i+="cycle: ".concat(W,", variant: ").concat(Q),
-null!=(a=w())&&(i+="/".concat(a))):i+="variant: ".concat(Q),
-i+=", total: ".concat(rt),
-console.log(i),it=s),D&&rt-ct>=D||C&&st-lt>=C||V&&s-ot>=V?(ct=rt,
-lt=st,ot=s,[4,Y(1)]):[3,2];case 1:
+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(at&&!tt.aborted)return[3,10];_.label=3;case 3:
-return _.trys.push([3,6,,9]),g(u=t(n,e,tt))?[4,u]:[3,5]
+;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,
-st+=h,rt+=d+h,[3,9]):(nt=!0,Z.abort(),
+it+=h,st+=d+h,[3,9]):(rt=!0,tt.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 L={error:v,args:n,index:e},nt=!1,[3,9]
+;return Q={error:v,args:n,index:e},rt=!1,[3,9]
 ;case 9:return[3,13];case 10:
-return at.hold(1)?[3,12]:[4,at.holdWait(1)]
+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==tt?void 0:tt.aborted)?[2]:g(r=t(n,e,tt))?[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,
-st+=s,rt+=i+s,[3,7]):(nt=!0,Z.abort(),[2]);case 3:
+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 L={error:o,args:n,index:e},nt=!1,[3,7]
-;case 6:return at.release(1),[7];case 7:return[2]}
+;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==N?void 0:N.aborted)||!nt&&!function(){
+return(null==N?void 0:N.aborted)||!rt&&!function(){
 for(;;){
-if($&&Q>=0&&(null==L||Q<L.index)&&++q<$.repeatsPerVariant)return B=$.getSeed({
-variantIndex:Q,cycleIndex:W,repeatIndex:q,
-totalIndex:W*$.repeatsPerVariant+q}),!0
-;if(q=0,Q++,$&&W>=$.cycles)return!1;var t=w()
-;if(null==t||Q<t){var n=H.next()
-;if(!n.done)return K=n.value,$&&(B=$.getSeed({
-variantIndex:Q,cycleIndex:W,repeatIndex:q,
-totalIndex:W*$.repeatsPerVariant+q})),!0}
-if(!$)return!1;if(++W>=$.cycles)return!1
-;Q=-1,H=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 at?[4,at.holdWait(G)]:[3,5];case 4:
-s.sent(),at.release(G),s.label=5;case 5:
-if(null==et?void 0:et.aborted)throw et.reason
-;return J&&console.log("[test-variants] variants: ".concat(Q,", iterations: ").concat(rt,", async: ").concat(st)),
-[4,Y(1)];case 6:return s.sent(),[2,rt]}})})}
-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
+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 S=n.saveErrorVariants,x=null!==(r=null==S?void 0:S.retriesPerVariant)&&void 0!==r?r:1,
 E=new Date,
@@ -528,10 +530,10 @@ return T.done?[3,9]:[4,u(T.value,S.jsonToArgs)]
 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(),ut={error:F
+return[3,12];case 10:return F=o.sent(),ht={error:F
 },[3,12];case 11:try{
-T&&!T.done&&(ht=k.return)&&ht.call(k)}finally{
-if(ut)throw ut.error}return[7];case 12:
+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,
@@ -539,16 +541,16 @@ 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=0,q=0,B=void 0,L=null,Q=-1,
-K={},H=e[Symbol.iterator](),Z=new I,tt=function(...t){
+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
-}(N,Z.signal),et=tt,nt=!1,rt=0,st=0,it=Date.now(),
-ot=it,ct=rt,lt=st,at=G<=1?null:new X(G),[4,j()]
-;case 13:return[2,{iterations:o.sent(),bestError:L
+}(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;
@@ -124,6 +125,7 @@ function testVariantsRun(testRun, variants, options = {}) {
                 if (!findBestError) {
                     return false;
                 }
+                prevCycleVariantsCount = index;
                 cycleIndex++;
                 if (cycleIndex >= findBestError.cycles) {
                     return false;
@@ -161,9 +163,14 @@ function testVariantsRun(testRun, variants, options = {}) {
                         let log = '';
                         if (findBestError) {
                             log += `cycle: ${cycleIndex}, variant: ${index}`;
-                            const _limitVariantsCount = getLimitVariantsCount();
-                            if (_limitVariantsCount != null) {
-                                log += `/${_limitVariantsCount}`;
+                            if (cycleIndex > 0) {
+                                let max = getLimitVariantsCount();
+                                if (max != null) {
+                                    if (prevCycleVariantsCount != null && prevCycleVariantsCount < max) {
+                                        max = prevCycleVariantsCount;
+                                    }
+                                    log += `/${max}`;
+                                }
                             }
                         }
                         else {

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;
@@ -100,6 +101,7 @@ function testVariantsRun(testRun, variants, options = {}) {
                 if (!findBestError) {
                     return false;
                 }
+                prevCycleVariantsCount = index;
                 cycleIndex++;
                 if (cycleIndex >= findBestError.cycles) {
                     return false;
@@ -137,9 +139,14 @@ function testVariantsRun(testRun, variants, options = {}) {
                         let log = '';
                         if (findBestError) {
                             log += `cycle: ${cycleIndex}, variant: ${index}`;
-                            const _limitVariantsCount = getLimitVariantsCount();
-                            if (_limitVariantsCount != null) {
-                                log += `/${_limitVariantsCount}`;
+                            if (cycleIndex > 0) {
+                                let max = getLimitVariantsCount();
+                                if (max != null) {
+                                    if (prevCycleVariantsCount != null && prevCycleVariantsCount < max) {
+                                        max = prevCycleVariantsCount;
+                                    }
+                                    log += `/${max}`;
+                                }
                             }
                         }
                         else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flemist/test-variants",
-  "version": "2.0.3",
+  "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",