File tree Expand file tree Collapse file tree 3 files changed +22
-10
lines changed
Expand file tree Collapse file tree 3 files changed +22
-10
lines changed Original file line number Diff line number Diff line change @@ -29,14 +29,26 @@ class utils {
2929 add_to_minutes = Math . floor ( doubledRange / 60 ) ;
3030 doubledRange = doubledRange % 60 ;
3131 }
32- new_expression [ "seconds" ] = `${ step } /${ doubledRange } ` ;
32+ if ( add_to_minutes ) {
33+ new_expression [ "seconds" ] = `${ doubledRange } ` ;
34+ }
35+ else {
36+ new_expression [ "seconds" ] = `${ step } /${ doubledRange } ` ;
37+ }
38+
3339 }
3440 else if ( expression [ "seconds" ] == "*" ) { // *
3541 // do nothing
3642 new_expression [ "seconds" ] = `*/2` ;
3743 }
3844 else { // 5
39-
45+ let range = expression [ "seconds" ] ;
46+ let doubledRange = parseInt ( range ) * 2 ;
47+ if ( doubledRange >= 60 ) {
48+ add_to_minutes = Math . floor ( doubledRange / 60 ) ;
49+ doubledRange = doubledRange % 60 ;
50+ }
51+ new_expression [ "seconds" ] = `${ doubledRange } ` ;
4052 }
4153
4254
Original file line number Diff line number Diff line change 11{
22 "name" : " @6degrees/node-cron-utils" ,
3- "version" : " 0.0.2 " ,
3+ "version" : " 0.0.3 " ,
44 "description" : " Utilities functions to manipulate node-cron expressions" ,
55 "main" : " main.js" ,
66 "scripts" : {
Original file line number Diff line number Diff line change @@ -22,18 +22,18 @@ test('testing */20 * * * * *', ()=>{
2222} )
2323
2424test ( 'testing */40 * * * * *' , ( ) => {
25- expect ( hi . double ( "*/40 * * * * *" ) ) . toBe ( "*/ 20 */1 * * * *" )
25+ expect ( hi . double ( "*/40 * * * * *" ) ) . toBe ( "20 */1 * * * *" )
2626} )
2727
28- test ( 'testing */ 20 */1 * * * *' , ( ) => {
29- expect ( hi . double ( "*/ 20 */1 * * * *" ) ) . toBe ( "*/ 40 */2 * * * *" )
28+ test ( 'testing 20 */1 * * * *' , ( ) => {
29+ expect ( hi . double ( "20 */1 * * * *" ) ) . toBe ( "40 */2 * * * *" )
3030} )
3131
32- test ( 'testing */ 40 */1 * * * *' , ( ) => {
33- expect ( hi . double ( "*/ 40 */1 * * * *" ) ) . toBe ( "*/ 20 */3 * * * *" )
32+ test ( 'testing 40 */1 * * * *' , ( ) => {
33+ expect ( hi . double ( "40 */1 * * * *" ) ) . toBe ( "20 */3 * * * *" )
3434} )
3535
36- test ( 'testing */ 40 */40 * * * *' , ( ) => {
37- expect ( hi . double ( "*/ 40 */40 * * * *" ) ) . toBe ( "*/ 20 */21 * * * *" ) // Not sure if this is correct
36+ test ( 'testing 40 */40 * * * *' , ( ) => {
37+ expect ( hi . double ( "40 */40 * * * *" ) ) . toBe ( "20 */21 * * * *" ) // Not sure if this is correct
3838} )
3939
You can’t perform that action at this time.
0 commit comments