cron-converter-u2q 1.1.0 → 1.2.0

package/README.md

@@ -1,10 +1,15 @@
 # cron-converter-u2q
 
-Easily work with cron expressions using the `cron-converter-u2q` package. Effortlessly convert between Unix and Quartz formats and describe cron schedules in plain language for better understanding and usability.
+![Github Repo Stars](https://img.shields.io/github/stars/rahu619/cron-converter-u2q?style=social)
+[![NPM version](https://img.shields.io/npm/v/cron-converter-u2q)](https://www.npmjs.com/package/cron-converter-u2q)
+![GitHub License](https://img.shields.io/github/license/rahu619/cron-converter-u2q?style=plastic)
+![GitHub Build](https://github.com/rahu619/cron-converter-u2q/actions/workflows/integration.yml/badge.svg?branch=main)
+![Github Release](https://github.com/rahu619/cron-converter-u2q/actions/workflows/release.yml/badge.svg?event=workflow_dispatch)
+![Github Top Language](https://img.shields.io/github/languages/top/rahu619/cron-converter-u2q?style=plastic)
 
-![example event parameter](https://github.com/rahu619/cron-converter-u2q/actions/workflows/integration.yml/badge.svg?branch=main)
-![example event parameter](https://github.com/rahu619/cron-converter-u2q/actions/workflows/release.yml/badge.svg?event=workflow_dispatch)
-[![NPM version](https://badge.fury.io/js/cron-converter-u2q.svg)](https://www.npmjs.com/package/cron-converter-u2q)
+[![https://nodei.co/npm/cron-converter-u2q.png?downloads=true&downloadRank=true&stars=true](https://nodei.co/npm/cron-converter-u2q.png?downloads=true&downloadRank=true&stars=true)](https://www.npmjs.com/package/cron-converter-u2q)
+
+Easily work with cron expressions using the `cron-converter-u2q` package. Effortlessly convert between Unix and Quartz formats and describe cron schedules in plain language.
 
 ### Features
 
@@ -81,20 +86,15 @@ const description = c2q.describeQuartz("0 0 8 * * ?");
 console.log(description); // Outputs: "At 8 o'clock"
 ```
 
-### Contribution Guide
-1. **Fork the repository.**
-2. **Create a feature branch:** 
-```bash 
-git checkout -b feature/xxxx
-```
-3. **Commit changes:** 
-4. **Push the branch:** 
-5. **Open a Pull Request.**
+## License
+This project is licensed under the [MIT License](https://opensource.org/license/mit/)
 
-### Development Notice
 
-Any feedback, suggestions, or contributions are highly appreciated!
+### Contributing
+Pull requests are welcome. For major changes, please open an issue first to discuss what you would like to change.
 
-## License
+Please make sure to update tests as appropriate.
+
+### Support
+Any feedback, suggestions, or contributions are highly appreciated!
 
-This project is licensed under the [MIT License](https://opensource.org/license/mit/)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cron-converter-u2q",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "Converts cron expressions between unix and quartz formats",
   "main": "lib/index.js",
   "types": "types/index.d.ts",
@@ -19,7 +19,10 @@
   ],
   "license": "MIT",
   "homepage": "https://github.com/rahu619/cron-converter-u2q",
-  "repository": "https://github.com/rahu619/cron-converter-u2q",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/rahu619/cron-converter-u2q.git"
+  },
   "devDependencies": {
     "@types/jest": "^29.5.3",
     "@types/mocha": "^10.0.1",

package/src/__tests__/index.test.ts

@@ -65,26 +65,25 @@ describe("Unix2Quartz Conversion", () => {
     expect(result).toBe("0 */15 * ? * *");
   });
 
-  //Include
-  // test('Last day of every month at 4:45 PM conversion', () => {
-  //     const result = converter.unixToQuartz('45 16 28-31 * *');
-  //     expect(result).toBe('45 16 L * ?');
-  // });
-
-  // test('Last Sunday of every month at 4:45 PM conversion', () => {
-  //     const result = converter.unixToQuartz('45 16 22-31 * 0');
-  //     expect(result).toBe('45 16 ? * 7L');
-  // });
-
-  // test('Second Wednesday of every month at 1:00 AM conversion', () => {
-  //     const result = converter.quartzToUnix('0 1 ? * 3#2');
-  //     expect(result).toBe('Not directly possible without additional logic');
-  // });
-
-  // test('Every last Friday of the month conversion', () => {
-  //     const result = converter.unixToQuartz('0 0 * * 5'); //Find equivalent unix expression
-  //     expect(result).toBe("0 0 0 ? * 5L");
-  // });
+  test("Last Friday of every month", () => {
+    const result = converter.unixToQuartz("0 0 * * 5L");
+    expect(result).toBe("0 0 0 ? * 5L");
+  });
+
+  test("Second Wednesday of every month", () => {
+    const result = converter.unixToQuartz("0 0 * * 3#2");
+    expect(result).toBe("0 0 0 ? * 3#2");
+  });
+
+  test("Multiple days of week (list)", () => {
+    const result = converter.unixToQuartz("0 0 * * 1,3,5");
+    expect(result).toBe("0 0 0 ? * 1,3,5");
+  });
+
+  test("Range of days of week", () => {
+    const result = converter.unixToQuartz("0 0 * * 1-5");
+    expect(result).toBe("0 0 0 ? * 1-5");
+  });
 });
 
 describe("Quartz2Unix Conversion", () => {
@@ -99,7 +98,7 @@ describe("Quartz2Unix Conversion", () => {
   });
 
   test("Every Monday at 12pm conversion", () => {
-    const result = converter.quartzToUnix("0 0 12 ? * 1");
+    const result = converter.quartzToUnix("0 0 12 ? * 2");
     expect(result).toBe("0 12 * * 1");
   });
 
@@ -117,6 +116,26 @@ describe("Quartz2Unix Conversion", () => {
     const result = converter.quartzToUnix("0 59 23 L * ?");
     expect(result).toBe("59 23 L * *");
   });
+
+  test("Last Friday of every month conversion", () => {
+    const result = converter.quartzToUnix("0 0 0 ? * 5L");
+    expect(result).toBe("0 0 * * 5L");
+  });
+
+  test("Second Wednesday of every month conversion", () => {
+    const result = converter.quartzToUnix("0 0 0 ? * 3#2");
+    expect(result).toBe("0 0 * * 3#2");
+  });
+
+  test("Multiple days of week (list) conversion", () => {
+    const result = converter.quartzToUnix("0 0 0 ? * 1,3,5");
+    expect(result).toBe("0 0 * * 1,3,5");
+  });
+
+  test("Range of days of week conversion", () => {
+    const result = converter.quartzToUnix("0 0 0 ? * 1-5");
+    expect(result).toBe("0 0 * * 1-5");
+  });
 });
 
 describe("Description", () => {

package/src/converter.ts

@@ -3,7 +3,7 @@ import { ExpressionHelper as helper } from './helper';
 export class CronConverterU2Q {
     static readonly everyXUnitsReplacePlaceholder = `%s`
     static readonly quartzEveryXUnitsRegex = /^0\/(\d+)$/; // For handling 0/5 units
-    static readonly unixEveryXUnitsRegex = /^\/(\d+)$/; // For handling */5 units
+    static readonly unixEveryXUnitsRegex = /^\*\/(\d+)$/; // For handling */5 units
     static readonly quartzEveryXUnitsReplacePattern = `0/${this.everyXUnitsReplacePlaceholder}`;
     static readonly unixEveryXUnitsReplacePattern = `*/${this.everyXUnitsReplacePlaceholder}`;
 
@@ -16,12 +16,8 @@ export class CronConverterU2Q {
         const parts = helper.GetExpressionParts(unixExpression);
         const [min, hour, dom, month, dow] = parts.map(part => this.convertIntervalParts(part));
 
-        // Converting Unix DOW to Quartz DOW
-        let quartzDow = dow.includes(',') ? dow.split(',').map(day => {
-            if (day === '0' || day === '7') return '1';
-            return (parseInt(day, 10) + 1).toString();
-        }).join(',') : dow;
-
+        // Enhanced DOW conversion: handle lists, ranges, and special cases
+        let quartzDow = this.unixDowToQuartz(dow);
         let quartzDom = dom;
 
         if (dom !== '*' && dow === '*') quartzDow = '?';
@@ -39,23 +35,19 @@ export class CronConverterU2Q {
         const parts = helper.GetExpressionParts(quartzExpression);
         const [_, min, hour, dom, month, dow] = parts.map(part => this.convertIntervalParts(part, true));
 
-
-        // Converting Quartz DOW to Unix DOW
-        let unixDow = dow.includes(',') ? dow.split(',').map(day => {
-            if (day === '1') return '0';
-            if (day === '?') return '*';
-            return (parseInt(day, 10) - 1).toString();
-        }).join(',') : dow;
-
+        // Enhanced DOW conversion: handle lists, ranges, and special cases
+        let unixDow = this.quartzDowToUnix(dow);
         let unixDom = dom;
 
         // If dow in Quartz was '?', set unixDom to '*'
         if (dow === '?') unixDom = '*';
 
-
         return `${min} ${hour} ${unixDom} ${month} ${unixDow}`;
     }
 
+    /**
+     * Converts interval parts for both Unix and Quartz expressions.
+     */
     private static convertIntervalParts(part: string, isQuartz = false): string {
         const everyXUnitsPattern = isQuartz ? this.quartzEveryXUnitsRegex : this.unixEveryXUnitsRegex;
         const matches = part.match(everyXUnitsPattern);
@@ -66,4 +58,52 @@ export class CronConverterU2Q {
         return part;
     }
 
+    /**
+     * Converts Unix DOW to Quartz DOW, supporting lists, ranges, and special cases.
+     */
+    private static unixDowToQuartz(dow: string): string {
+        if (dow === '*' || dow === '?') return dow;
+        if (dow.includes(',')) return dow.split(',').map(this.unixDowToQuartz).join(',');
+        if (dow.includes('-')) return dow.split('-').map(this.unixDowToQuartz).join('-');
+        if (dow.endsWith('L')) {
+            const day = dow.slice(0, -1);
+            return `${this.unixDowToQuartz(day)}L`;
+        }
+        if (dow.includes('#')) {
+            const [day, nth] = dow.split('#');
+            return `${this.unixDowToQuartz(day)}#${nth}`;
+        }
+        if (dow === '0' || dow === '7') return '1'; // Sunday
+        // For 1-6 (Monday-Saturday), keep as is
+        return dow;
+    }
+
+    /**
+     * Converts Quartz DOW to Unix DOW, supporting lists, ranges, and special cases.
+     */
+    private static quartzDowToUnix(dow: string): string {
+        if (dow === '*' || dow === '?') return dow === '?' ? '*' : dow;
+
+        // Last (L) - do not map the numeric part, just return as is
+        if (dow.endsWith('L')) {
+            return dow;
+        }
+
+        // Nth (#) - do not map the numeric part, just return as is
+        if (dow.includes('#')) {
+            return dow;
+        }
+
+        // For lists and ranges, do not map, just return as is
+        if (dow.includes(',') || dow.includes('-')) {
+            return dow;
+        }
+
+        // Numeric mapping
+        if (dow === '1') return '0'; // Sunday
+        const num = parseInt(dow, 10);
+        if (!isNaN(num) && num >= 2 && num <= 7) return (num - 1).toString();
+
+        return dow;
+    }
 }