namirasoft-core 1.4.99 → 1.4.100

package/dist/CronOperation.d.ts

@@ -3,4 +3,5 @@ export declare class CronOperation {
     static isValid(pattern: string): boolean;
     static check(pattern: string): void;
     static getNumbers(pattern: string, min: number, max: number): number[];
+    static getNext(current: number, pattern: string, min: number, max?: number): number;
 }

package/dist/CronOperation.js

@@ -54,6 +54,53 @@ class CronOperation {
         });
         return ans;
     }
+    static getNext(current, pattern, min, max) {
+        function getNextLoop(current, start, end, step) {
+            if (current < start)
+                return start;
+            const offset = Math.ceil((current - start + 1) / step) * step;
+            const next = start + offset;
+            if (end == null)
+                return next;
+            return next > end ? start : next;
+        }
+        function forwardDistance(current, candidate, min, max) {
+            if (max == null)
+                return candidate > current ? candidate - current : Infinity;
+            const ring = max - min + 1;
+            const curIdx = current - min;
+            const candIdx = candidate - min;
+            let dist = (candIdx - curIdx + ring) % ring;
+            if (dist === 0)
+                dist = ring;
+            return dist;
+        }
+        let patterns = CronOperation.splitPatterns(pattern);
+        let ans = null;
+        let bestDist = Infinity;
+        for (let i = 0; i < patterns.length; i++) {
+            const element = patterns[i];
+            let ts = element.split('/').map(p => p.trim());
+            let step = ts.length == 1 ? 1 : parseInt(ts[1]);
+            let candidate;
+            if (element.includes("-")) {
+                let ns = element.split('-').map(p => p.trim());
+                let start = Math.max(min, parseInt(ns[0]));
+                let end = Math.min(max !== null && max !== void 0 ? max : parseInt(ns[1]), parseInt(ns[1]));
+                candidate = getNextLoop(current, start, end, step);
+            }
+            else if (element.includes("*"))
+                candidate = getNextLoop(current, min, max, step);
+            else
+                candidate = parseInt(element);
+            const dist = forwardDistance(current, candidate, min, max);
+            if (dist < bestDist) {
+                bestDist = dist;
+                ans = candidate;
+            }
+        }
+        return ans !== null && ans !== void 0 ? ans : current;
+    }
 }
 exports.CronOperation = CronOperation;
 //# sourceMappingURL=CronOperation.js.map

package/dist/CronOperation.js.map

@@ -1 +1 @@
-{"version":3,"file":"CronOperation.js","sourceRoot":"","sources":["../src/CronOperation.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"CronOperation.js","sourceRoot":"","sources":["../src/CronOperation.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -8,7 +8,7 @@
     "framework": "npm",
     "application": "package",
     "private": false,
-    "version": "1.4.99",
+    "version": "1.4.100",
     "author": "Amir Abolhasani",
     "license": "MIT",
     "main": "./dist/index.js",
@@ -17,7 +17,7 @@
         "build": ""
     },
     "dependencies": {
-        "@types/node": "^24.7.2",
+        "@types/node": "^24.8.1",
         "async-mutex": "^0.5.0",
         "axios": "^1.12.2",
         "buffer": "^6.0.3",

package/src/CronOperation.ts

@@ -60,4 +60,60 @@ export class CronOperation
         });
         return ans;
     }
+    static getNext(current: number, pattern: string, min: number, max?: number): number
+    {
+        function getNextLoop(current: number, start: number, end: number | undefined, step: number)
+        {
+            if (current < start)
+                return start;
+            const offset = Math.ceil((current - start + 1) / step) * step;
+            const next = start + offset;
+            if (end == null)
+                return next;
+            return next > end ? start : next;
+        }
+        function forwardDistance(current: number, candidate: number, min: number, max?: number): number
+        {
+            if (max == null)
+                return candidate > current ? candidate - current : Infinity;
+            const ring = max - min + 1;
+            const curIdx = current - min;
+            const candIdx = candidate - min;
+            let dist = (candIdx - curIdx + ring) % ring;
+            if (dist === 0)
+                dist = ring;
+            return dist;
+        }
+
+        let patterns = CronOperation.splitPatterns(pattern);
+        let ans: number | null = null;
+        let bestDist = Infinity;
+        for (let i = 0; i < patterns.length; i++)
+        {
+            const element = patterns[i];
+            let ts = element.split('/').map(p => p.trim());
+            let step = ts.length == 1 ? 1 : parseInt(ts[1]);
+            let candidate: number;
+            if (element.includes("-"))
+            {
+                let ns = element.split('-').map(p => p.trim());
+                let start = Math.max(min, parseInt(ns[0]));
+                let end = Math.min(max ?? parseInt(ns[1]), parseInt(ns[1]));
+                candidate = getNextLoop(current, start, end, step);
+            }
+            else if (element.includes("*"))
+                candidate = getNextLoop(current, min, max, step);
+            else
+                candidate = parseInt(element);
+
+            const dist = forwardDistance(current, candidate, min, max);
+
+            if (dist < bestDist)
+            {
+                bestDist = dist;
+                ans = candidate;
+            }
+        }
+        return ans ?? current;
+    }
 }