cron-converter-u2q 0.1.14 → 0.1.16

package/.github/workflows/integration.yml

@@ -1,33 +1,33 @@
-name: Build
-on:
-  push:
-    branches: [main]
-  pull_request:
-    branches: [main]
-jobs:
-  build:
-    name: Build and Test
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        node-version: [16.x, 18.x, 20.x]
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
-
-      - name: Setup Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v3
-        with:
-          node-version: ${{ matrix.node-version }}
-
-      - name: Clean Install Dependencies
-        run: npm ci
-
-      - name: Run Tests
-        run: npm test
-
-      - name: Linting
-        run: npm run lint
-
-      - name: Run build
-        run: npm run build --if-present
+name: Build
+on:
+  push:
+    branches: [main]
+  pull_request:
+    branches: [main]
+jobs:
+  build:
+    name: Build and Test
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        node-version: [16.x, 18.x, 20.x]
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Setup Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v3
+        with:
+          node-version: ${{ matrix.node-version }}
+
+      - name: Clean Install Dependencies
+        run: npm ci
+
+      - name: Run Tests
+        run: npm test
+
+      - name: Linting
+        run: npm run lint
+
+      - name: Run build
+        run: npm run build --if-present

package/.github/workflows/release.yml

@@ -1,55 +1,55 @@
-name: Release
-on:
-  workflow_run:
-    workflows: ["Build"]
-    types:
-      - completed
-jobs:
-  release:
-    permissions: write-all
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - name: Setup node.js
-        uses: actions/setup-node@v3
-        with:
-          node-version: "18.x"
-          registry-url: "https://registry.npmjs.org"
-
-      - name: Publish to NPM
-        run: npm publish
-        env:
-          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
-
-      - name: Get package version
-        id: pkgver
-        run: echo "::set-output name=version::$(node -p "require('./package.json').version")"
-
-        # Creates a .tgz file in your working directory
-      - name: Package NPM tarball
-        run: npm pack
-
-      # - name: Debug GitHub event
-      #   run: echo "${{ toJson(github.event.release) }}"
-
-      - name: Create Release
-        id: create_release
-        uses: actions/create-release@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          tag_name: ${{ steps.pkgver.outputs.version }}
-          release_name: Release ${{ steps.pkgver.outputs.version }}
-          draft: false
-          prerelease: false
-
-      - name: Upload Release Asset
-        id: upload-release-asset
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`.
-          # asset_path: ./your-package-name-${{ steps.pkgver.outputs.version }}.tgz
-          asset_name: your-package-name-${{ steps.pkgver.outputs.version }}.tgz
-          asset_content_type: application/gzip
+name: Release
+on:
+  workflow_run:
+    workflows: ["Build"]
+    types:
+      - completed
+jobs:
+  release:
+    permissions: write-all
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Setup node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: "18.x"
+          registry-url: "https://registry.npmjs.org"
+
+      - name: Publish to NPM
+        run: npm publish
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+
+      - name: Get package version
+        id: pkgver
+        run: echo "::set-output name=version::$(node -p "require('./package.json').version")"
+
+        # Creates a .tgz file in your working directory
+      - name: Package NPM tarball
+        run: npm pack
+
+      # - name: Debug GitHub event
+      #   run: echo "${{ toJson(github.event.release) }}"
+
+      - name: Create Release
+        id: create_release
+        uses: actions/create-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag_name: ${{ steps.pkgver.outputs.version }}
+          release_name: Release ${{ steps.pkgver.outputs.version }}
+          draft: false
+          prerelease: false
+
+      - name: Upload Release Asset
+        id: upload-release-asset
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`.
+          asset_path: ./cron-converter-u2q-${{ steps.pkgver.outputs.version }}.tgz
+          asset_name: cron-converter-u2q-${{ steps.pkgver.outputs.version }}.tgz
+          asset_content_type: application/gzip

package/LICENSE

@@ -1,21 +1,21 @@
-MIT License
-
-Copyright (c) 2023 Rahul
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+MIT License
+
+Copyright (c) 2023 Rahul
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/README.md

@@ -1,61 +1,61 @@
-# cron-converter-u2q
-
-Easily convert cron expressions between Unix and Quartz formats with the `cron-converter-u2q` package
-
-![example event parameter](https://github.com/rahu619/cron-converter-u2q/actions/workflows/integration.yml/badge.svg?event=push)
-![example event parameter](https://github.com/rahu619/cron-converter-u2q/actions/workflows/release.yml/badge.svg?event=push)
-[![NPM version](https://badge.fury.io/js/cron-converter-u2q.svg)](https://www.npmjs.com/package/cron-converter-u2q)
-
-### Features
-
-:arrows_counterclockwise: Two-way conversion: from Unix to Quartz and Quartz to Unix.
-
-### Installation
-
-Using npm:
-
-```bash
-npm install cron-converter
-```
-
-Using yarn:
-
-```bash
-yarn add cron-converter
-```
-
-### Usage
-
-Firstly, import the CronConverterU2Q module:
-
-```javascript
-var cron_converter_u2q = require("cron-converter-u2q");
-
-var c2q = cron_converter_u2q.CronConverterU2Q;
-```
-
-If you're using ES6 Modules
-
-```javascript
-import { CronConverterU2QModule as c2q } from "cron-converter-u2q";
-```
-
-Convert from Unix to Quartz
-
-```javascript
-const quartzExpression = c2q.unixToQuartz("5 * * * *");
-```
-
-Convert from Quartz to Unix
-
-```javascript
-const unixExpression = c2q.quartzToUnix("* */5 * ? * * *");
-```
-
-### Development Notice
-
-This package is still under active development. Some methods and features might not be stable yet. We're working diligently to improve and stabilize the package. Any feedback, suggestions, or contributions are highly appreciated!
-
-## License
-
-This project is licensed under the [MIT License](https://opensource.org/license/mit/)
+# cron-converter-u2q
+
+Easily convert cron expressions between Unix and Quartz formats with the `cron-converter-u2q` package
+
+![example event parameter](https://github.com/rahu619/cron-converter-u2q/actions/workflows/integration.yml/badge.svg?event=push)
+![example event parameter](https://github.com/rahu619/cron-converter-u2q/actions/workflows/release.yml/badge.svg?event=push)
+[![NPM version](https://badge.fury.io/js/cron-converter-u2q.svg)](https://www.npmjs.com/package/cron-converter-u2q)
+
+### Features
+
+:arrows_counterclockwise: Two-way conversion: from Unix to Quartz and Quartz to Unix.
+
+### Installation
+
+Using npm:
+
+```bash
+npm install cron-converter-u2q
+```
+
+Using yarn:
+
+```bash
+yarn add cron-converter-u2q
+```
+
+### Usage
+
+Firstly, import the CronConverterU2Q module:
+
+```javascript
+var cron_converter_u2q = require("cron-converter-u2q");
+
+var c2q = cron_converter_u2q.CronConverterU2Q;
+```
+
+If you're using ES6 Modules
+
+```javascript
+import { CronConverterU2QModule as c2q } from "cron-converter-u2q";
+```
+
+Convert from Unix to Quartz
+
+```javascript
+const quartzExpression = c2q.unixToQuartz("5 * * * *");
+```
+
+Convert from Quartz to Unix
+
+```javascript
+const unixExpression = c2q.quartzToUnix("* */5 * ? * * *");
+```
+
+### Development Notice
+
+This package is still under active development. Some methods and features might not be stable yet. We're working diligently to improve and stabilize the package. Any feedback, suggestions, or contributions are highly appreciated!
+
+## License
+
+This project is licensed under the [MIT License](https://opensource.org/license/mit/)

package/jest.config.ts

@@ -1,10 +1,10 @@
-module.exports = {
-    preset: 'ts-jest',
-    testEnvironment: 'node',
-    roots: ['./src/'],
-    transform: {
-        '^.+\\.tsx?$': 'ts-jest'
-    },
-    testRegex: '(/__tests__/.*|(\\.|/)(test|spec))\\.tsx?$',
-    moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'json', 'node'],
+module.exports = {
+    preset: 'ts-jest',
+    testEnvironment: 'node',
+    roots: ['./src/'],
+    transform: {
+        '^.+\\.tsx?$': 'ts-jest'
+    },
+    testRegex: '(/__tests__/.*|(\\.|/)(test|spec))\\.tsx?$',
+    moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'json', 'node'],
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cron-converter-u2q",
-  "version": "0.1.14",
+  "version": "0.1.16",
   "description": "Converts cron expressions between unix and quartz formats",
   "main": "lib/index.js",
   "types": "types/index.d.ts",

package/src/__tests__/index.test.ts

@@ -1,24 +1,82 @@
-import { CronConverterU2Q as c2q } from '../index';
-
-//Basic suite of tests
-describe('Unix2Quartz Conversion', () => {
-
-    test('unixToQuartz conversion', () => {
-        const result = c2q.unixToQuartz('*/5 * * * *'); //Every 5 minutes
-        expect(result).toBe("0 */5 * ? * *");
-    });
-
-    test('unixToQuartz conversion', () => {
-        const result = c2q.unixToQuartz('0 12 * * *'); //Everyday at 12pm
-        expect(result).toBe("0 0 12 ? * *");
-    });
-});
-
-
-describe('Quartz2Unix Conversion', () => {
-
-    test('quartzToUnix conversion', () => {
-        const result = c2q.quartzToUnix('* */5 * ? * * *'); //Every 5 minutes
-        expect(result).toBe("*/5 * * * *");
-    });
+import { CronConverterU2Q as c2q } from '../index';
+
+//Basic suite of tests
+describe('Unix2Quartz Conversion', () => {
+
+    test('Every 5 minutes', () => {
+        const result = c2q.unixToQuartz('*/5 * * * *');
+        expect(result).toBe("0 */5 * ? * *");
+    });
+
+    test('Everyday at 12pm', () => {
+        const result = c2q.unixToQuartz('0 12 * * *');
+        expect(result).toBe("0 0 12 ? * *");
+    });
+
+    test('Every Monday at 12pm conversion', () => {
+        const result = c2q.unixToQuartz('0 12 * * 1');
+        expect(result).toBe("0 0 12 ? * 1");
+    });
+
+    test('Every 10th day of the month conversion', () => {
+        const result = c2q.unixToQuartz('0 0 10 * *');
+        expect(result).toBe("0 0 0 10 * ?");
+    });
+
+    test('Every January 1st at 12am conversion', () => {
+        const result = c2q.unixToQuartz('0 0 1 1 *');
+        expect(result).toBe("0 0 0 1 1 ?");
+    });
+
+    test('Every last day of the month conversion', () => {
+        const result = c2q.unixToQuartz('59 23 L * *');
+        expect(result).toBe("0 59 23 L * ?");
+    });
+
+    //Failing test case
+    // test('Every last Friday of the month conversion', () => {
+    //     const result = c2q.unixToQuartz('0 0 L * 5');
+    //     expect(result).toBe("0 0 0 ? * 5L");
+    // });
+
+});
+
+
+describe('Quartz2Unix Conversion', () => {
+
+    test('Every 5 minutes conversion', () => {
+        const result = c2q.quartzToUnix('0 */5 * ? * *');
+        expect(result).toBe("*/5 * * * *");
+    });
+
+    test('Everyday at 12pm conversion', () => {
+        const result = c2q.quartzToUnix('0 0 12 ? * *');
+        expect(result).toBe("0 12 * * *");
+    });
+
+    test('Every Monday at 12pm conversion', () => {
+        const result = c2q.quartzToUnix('0 0 12 ? * 1');
+        expect(result).toBe("0 12 * * 1");
+    });
+
+    test('Every 10th day of the month conversion', () => {
+        const result = c2q.quartzToUnix('0 0 0 10 * ?');
+        expect(result).toBe("0 0 10 * *");
+    });
+
+    test('Every January 1st at 12am conversion', () => {
+        const result = c2q.quartzToUnix('0 0 0 1 1 ?');
+        expect(result).toBe("0 0 1 1 *");
+    });
+
+    test('Every last day of the month conversion', () => {
+        const result = c2q.quartzToUnix('0 59 23 L * ?');
+        expect(result).toBe("59 23 L * *");
+    });
+
+    //Failing test case
+    // test('Every last Friday of the month conversion', () => {
+    //     const result = c2q.quartzToUnix('0 0 0 ? * 5L');
+    //     expect(result).toBe("0 0 L * 5");
+    // });
 });

package/src/converter.ts

@@ -1,57 +1,65 @@
-export class CronConverterU2Q {
-
-    static readonly delimiter = ' ';
-    static readonly unixExpressionLength = 5;
-    static readonly quartzExpressionLengths = [6, 7];
-
-    /**
-     * Converts a unix cron expression to a quartz cron expression by adding '0' seconds
-     * @param unixExpression - the unix expression
-     * @returns the corresponding quartz expression
-     */
-    public static unixToQuartz(unixExpression: string): string {
-
-        this.validateIfNullOrEmpty(unixExpression);
-
-        const parts = unixExpression.split(this.delimiter);
-        if (parts.length !== this.unixExpressionLength) throw new Error(`Invalid unix cron format`);
-
-        const [min, hour, dom, month, dow] = parts;
-        let quartzDom = dom;
-        let quartzDow = dow;
-
-        if (dom !== '*' && dow === '*') quartzDow = '?';
-        else if (dom === '*') quartzDom = '?';
-
-        return `0 ${min} ${hour} ${quartzDom} ${month} ${quartzDow}`;
-    }
-
-    /**
-     * Converts a quartz cron expression to a unix cron expression
-     * @param quartzExpression - the quartz expression
-     * @returns the corresponding unix expression
-     */
-    public static quartzToUnix(quartzExpression: string): string {
-
-        this.validateIfNullOrEmpty(quartzExpression);
-
-        const parts = quartzExpression.split(this.delimiter);
-
-        if (!this.quartzExpressionLengths.includes(parts.length)) throw new Error(`Invalid quartz cron format`);
-
-        const [_, min, hour, dom, month, dow] = parts;
-        let unixDom = dom;
-        let unixDow = dow;
-
-        if (dom === '?' && dow === '*') unixDom = '*';
-        else if (dow === '?' && dom === '*') unixDow = '*';
-        else if (dom !== '?' && dom === '?') unixDom = '*';
-
-        return `${min} ${hour} ${unixDom} ${month} ${unixDow}`;
-    }
-
-    private static validateIfNullOrEmpty(cronExpression: string | undefined | null): void {
-        if (!cronExpression || cronExpression.trim() === '') throw new Error('Empty or null expression');
-    }
-
-}
+export class CronConverterU2Q {
+
+    static readonly delimiter = ' ';
+    static readonly unixExpressionLength = 5;
+    static readonly quartzExpressionLengths = [6, 7];
+    static readonly everyXUnitsReplacePlaceholder = `%s`
+    static readonly quartzEveryXUnitsRegex = /^0\/(\d+)$/; // For handling 0/5 units
+    static readonly unixEveryXUnitsRegex = /^\/(\d+)$/; // For handling */5 units
+    static readonly quartzEveryXUnitsReplacePattern = `0/${this.everyXUnitsReplacePlaceholder}`;
+    static readonly unixEveryXUnitsReplacePattern = `*/${this.everyXUnitsReplacePlaceholder}`;
+
+    /**
+     * Converts a unix cron expression to a quartz cron expression by adding '0' seconds
+     * @param unixExpression - the unix expression
+     * @returns the corresponding quartz expression
+     */
+    public static unixToQuartz(unixExpression: string): string {
+
+        this.validateIfNullOrEmpty(unixExpression);
+        const parts = unixExpression.split(this.delimiter);
+        if (parts.length !== this.unixExpressionLength) throw new Error(`Invalid unix cron format`);
+
+        const [min, hour, dom, month, dow] = parts.map(part => this.convertIntervalParts(part));
+        let quartzDom = dom;
+        let quartzDow = dow;
+
+        if (dom !== '*' && dow === '*') quartzDow = '?';
+        else if (dom === '*') quartzDom = '?';
+
+        return `0 ${min} ${hour} ${quartzDom} ${month} ${quartzDow}`;
+    }
+
+    /**
+     * Converts a quartz cron expression to a unix cron expression
+     * @param quartzExpression - the quartz expression
+     * @returns the corresponding unix expression
+     */
+    public static quartzToUnix(quartzExpression: string): string {
+
+        this.validateIfNullOrEmpty(quartzExpression);
+        const parts = quartzExpression.replace('?', '*').split(this.delimiter);
+        if (!this.quartzExpressionLengths.includes(parts.length)) throw new Error(`Invalid quartz cron format`);
+
+        const [_, min, hour, dom, month, dow] = parts.map(part => this.convertIntervalParts(part, true));
+
+        return `${min} ${hour} ${dom} ${month} ${dow}`;
+    }
+
+    private static validateIfNullOrEmpty(cronExpression: string | undefined | null): void {
+        if (!cronExpression || cronExpression.trim() === '') throw new Error('Empty or null expression');
+    }
+
+    private static convertIntervalParts(part: string, isQuartz = false): string {
+        part = part.trim();
+
+        const everyXUnitsPattern = isQuartz ? this.quartzEveryXUnitsRegex : this.unixEveryXUnitsRegex;
+        const matches = part.match(everyXUnitsPattern);
+        const everyXUnitsReplacePattern = isQuartz ? this.quartzEveryXUnitsReplacePattern : this.unixEveryXUnitsReplacePattern;
+
+        if (matches) return `${everyXUnitsReplacePattern.replace(this.everyXUnitsReplacePlaceholder, matches[1])}`;
+
+        return part;
+    }
+
+}

package/src/index.ts

@@ -1,3 +1,3 @@
-export * from './converter';
-
-
+export * from './converter';
+
+

package/tsconfig.json

@@ -1,20 +1,20 @@
-{
-  "compilerOptions": {
-    /* Language and Environment */
-    "target": "es2016" /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */,
-    "module": "commonjs" /* Specify what module code is generated. */,
-    "outDir": "./lib" /* Specify an output folder for all emitted files. */,
-    "esModuleInterop": true /* Emit additional JavaScript to ease support for importing CommonJS modules. This enables 'allowSyntheticDefaultImports' for type compatibility. */,
-    "declaration": true,
-    // "preserveSymlinks": true,                         /* Disable resolving symlinks to their realpath. This correlates to the same flag in node. */
-    "forceConsistentCasingInFileNames": true /* Ensure that casing is correct in imports. */,
-
-    /* Type Checking */
-    "strict": true /* Enable all strict type-checking options. */,
-    /* Completeness */
-    // "skipDefaultLibCheck": true,                      /* Skip type checking .d.ts files that are included with TypeScript. */
-    "skipLibCheck": true /* Skip type checking all .d.ts files. */
-  },
-  "include": ["src/**/*.ts"],
-  "exclude": ["node_modules", "**/__tests__/**"]
-}
+{
+  "compilerOptions": {
+    /* Language and Environment */
+    "target": "es2016" /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */,
+    "module": "commonjs" /* Specify what module code is generated. */,
+    "outDir": "./lib" /* Specify an output folder for all emitted files. */,
+    "esModuleInterop": true /* Emit additional JavaScript to ease support for importing CommonJS modules. This enables 'allowSyntheticDefaultImports' for type compatibility. */,
+    "declaration": true,
+    // "preserveSymlinks": true,                         /* Disable resolving symlinks to their realpath. This correlates to the same flag in node. */
+    "forceConsistentCasingInFileNames": true /* Ensure that casing is correct in imports. */,
+
+    /* Type Checking */
+    "strict": true /* Enable all strict type-checking options. */,
+    /* Completeness */
+    // "skipDefaultLibCheck": true,                      /* Skip type checking .d.ts files that are included with TypeScript. */
+    "skipLibCheck": true /* Skip type checking all .d.ts files. */
+  },
+  "include": ["src/**/*.ts"],
+  "exclude": ["node_modules", "**/__tests__/**"]
+}

package/types/index.d.ts

@@ -1,6 +1,6 @@
-declare module 'cron-converter-u2q' {
-    export const CronConverterU2QModule: {
-        unixToQuartz(unixExpression: string): string;
-        quartzToUnix(quartzExpression: string): string;
-    }
-}
+declare module 'cron-converter-u2q' {
+    export const CronConverterU2QModule: {
+        unixToQuartz(unixExpression: string): string;
+        quartzToUnix(quartzExpression: string): string;
+    }
+}