Merge pull request #5 from FreaKzero/feat/4/multi-months

feat(4): Multiple month Support

Author: FreaKzero

.github/workflows/develop.yml

@@ -10,9 +10,9 @@ jobs:
     runs-on: ubuntu-18.04
     steps:
       - uses: actions/checkout@v1
-      
+
       - name: install dependencies
         run: npm install
-        
+
       - name: Test
         run: npm run test

.github/workflows/prtitle.yml

@@ -12,4 +12,4 @@ jobs:
     steps:
       - uses: amannn/action-semantic-pull-request@v1.1.1
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/publish.yml

@@ -6,7 +6,7 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-latest 
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v2
@@ -21,4 +21,4 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - run: npm publish --access public
         env:
-          NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
+          NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}

.releaserc.json

@@ -1,7 +1,5 @@
 {
-  "branches": [
-    "main"
-  ],
+  "branches": ["main"],
   "plugins": [
     [
       "@semantic-release/commit-analyzer",
@@ -21,9 +19,12 @@
         }
       }
     ],
-    ["@semantic-release/npm", {
-      "npmPublish": false
-    }],
+    [
+      "@semantic-release/npm",
+      {
+        "npmPublish": false
+      }
+    ],
     "@semantic-release/github",
     [
       "@semantic-release/git",
@@ -33,4 +34,4 @@
       }
     ]
   ]
-}
+}

index.js

@@ -52,7 +52,9 @@ const dateParser = (pattern, string) => {
     /(jan|feb|mar|apr|may|jun|jul|aug|sep|oct|nov|dec) ([0-9]{1,2})/.exec(
       string
     );
-  const mon = /(jan|feb|mar|apr|may|jun|jul|aug|sep|oct|nov|dec)/.exec(string);
+  const monthMatch = string.match(
+    /(\d+)? (jan|feb|mar|apr|may|jun|jul|aug|sep|oct|nov|dec)/g
+  );
   const months = [
     '',
     'jan',
@@ -72,8 +74,13 @@ const dateParser = (pattern, string) => {
   if (full) {
     pattern[3] = full[2];
     pattern[4] = months.indexOf(full[1]);
-  } else if (mon) {
-    pattern[4] = months.indexOf(mon[1]);
+  } else if (monthMatch) {
+    const mon = monthMatch
+      .map((i) => months.indexOf(i.trim()))
+      .sort((a, b) => a - b);
+    if (mon.length) {
+      pattern[4] = mon.join(',');
+    }
   }
 
   return pattern;

readme.md

@@ -48,7 +48,7 @@ You can also write the full words like `on saturday at 9:30`
 Examples:
 
 ```
-on mon tue wed every 15 minutes 
+on mon tue wed every 15 minutes
 in december on mondays and saturdays at 9:30
 on mondays at 10:30
 ```
@@ -57,10 +57,19 @@ on mondays at 10:30
 
 You can either use exact dates like `in dec 9 at 9:30` or only months `in dec at 9:30`
 You can also write the full words like `in december at 9:30`
+Multiple Months are supported
+
 ### Tokens
 
 `jan, feb, mar, apr, may, jun, jul, aug, sep, oct, nov, dec`
 
+Examples:
+
+```
+on jan feb mar only mondays tuesdays and saturdays at 9:30
+on dec mar apr at 13:37
+```
+
 ## Times:
 
 Times will get sanitized and seconds are optional, to use times the token _at_ is needed. Timeformat is 24 hours and not AM/PM.

test.js

@@ -39,6 +39,12 @@ test('at 9:10 every year', '0 10 9 1 1 *');
 test('at 9:10 every year on saturdays', '0 10 9 1 1 *');
 test('every fri mon wed in oct at 10:30', '0 30 10 * 10 1,3,5');
 test('very mondays in december all 15 minutes', '0 */15 * * 12 1');
+test('on jan feb mar at 9:30', '0 30 9 * 1,2,3 *');
+test(
+  'on jan feb mar only mondays tuesdays and saturdays at 9:30',
+  '0 30 9 * 1,2,3 1,2,6'
+);
+test('on jan feb every 45 minutes', '0 */45 * * 1,2 *');
 
 if (process.env.TESTWATCH) {
   process.stdout.write('\u001b[3J\u001b[2J\u001b[1J');