@open-mercato/scheduler 0.7.1-develop.7193.1.910a5b0a1e → 0.7.1-develop.7194.1.ab4fc81f82

package/dist/index.js

@@ -1,6 +1,6 @@
 import { ScheduledJob } from "./modules/scheduler/data/entities.js";
 import { SchedulerService } from "./modules/scheduler/services/schedulerService.js";
-import { parseCronExpression, validateCron } from "./modules/scheduler/lib/cronParser.js";
+import { parseCronExpression, validateCron, validateCronExpression } from "./modules/scheduler/lib/cronParser.js";
 import { parseInterval, validateInterval, intervalToHuman } from "./modules/scheduler/lib/intervalParser.js";
 import { calculateNextRun, recalculateNextRun } from "./modules/scheduler/lib/nextRunCalculator.js";
 export {
@@ -12,6 +12,7 @@ export {
   parseInterval,
   recalculateNextRun,
   validateCron,
+  validateCronExpression,
   validateInterval
 };
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../src/index.ts"],
-  "sourcesContent": ["/**\n * @open-mercato/scheduler\n * \n * Database-managed scheduled jobs with admin UI\n */\n\nexport { ScheduledJob } from './modules/scheduler/data/entities.js'\nexport { SchedulerService } from './modules/scheduler/services/schedulerService.js'\nexport type { ScheduleRegistration } from './modules/scheduler/services/schedulerService.js'\n\n// Parsers and utilities\nexport { parseCronExpression, validateCron } from './modules/scheduler/lib/cronParser.js'\nexport { parseInterval, validateInterval, intervalToHuman } from './modules/scheduler/lib/intervalParser.js'\nexport { calculateNextRun, recalculateNextRun } from './modules/scheduler/lib/nextRunCalculator.js'\n"],
-  "mappings": "AAMA,SAAS,oBAAoB;AAC7B,SAAS,wBAAwB;AAIjC,SAAS,qBAAqB,oBAAoB;AAClD,SAAS,eAAe,kBAAkB,uBAAuB;AACjE,SAAS,kBAAkB,0BAA0B;",
+  "sourcesContent": ["/**\n * @open-mercato/scheduler\n * \n * Database-managed scheduled jobs with admin UI\n */\n\nexport { ScheduledJob } from './modules/scheduler/data/entities.js'\nexport { SchedulerService } from './modules/scheduler/services/schedulerService.js'\nexport type { ScheduleRegistration } from './modules/scheduler/services/schedulerService.js'\n\n// Parsers and utilities\nexport { parseCronExpression, validateCron, validateCronExpression } from './modules/scheduler/lib/cronParser.js'\nexport type { CronValidationResult } from './modules/scheduler/lib/cronParser.js'\nexport { parseInterval, validateInterval, intervalToHuman } from './modules/scheduler/lib/intervalParser.js'\nexport { calculateNextRun, recalculateNextRun } from './modules/scheduler/lib/nextRunCalculator.js'\n"],
+  "mappings": "AAMA,SAAS,oBAAoB;AAC7B,SAAS,wBAAwB;AAIjC,SAAS,qBAAqB,cAAc,8BAA8B;AAE1E,SAAS,eAAe,kBAAkB,uBAAuB;AACjE,SAAS,kBAAkB,0BAA0B;",
   "names": []
 }

package/dist/modules/scheduler/lib/cronParser.js

@@ -39,6 +39,28 @@ function getNextOccurrences(cronExpression, count, timezone = "UTC", currentDate
     return [];
   }
 }
+function validateCronExpression(cronExpression, options = {}) {
+  if (!cronExpression || cronExpression.trim() === "") {
+    return { ok: false, error: "Cron expression cannot be empty" };
+  }
+  const count = Math.max(1, Math.min(options.count ?? 3, 10));
+  try {
+    const interval = parseExpression(cronExpression, {
+      currentDate: options.currentDate || /* @__PURE__ */ new Date(),
+      tz: options.timezone ?? "UTC"
+    });
+    const nextRuns = [];
+    for (let i = 0; i < count; i++) {
+      nextRuns.push(interval.next().toDate());
+    }
+    return { ok: true, nextRuns };
+  } catch (error) {
+    return {
+      ok: false,
+      error: error instanceof Error ? error.message : "Invalid cron expression"
+    };
+  }
+}
 function validateCron(cronExpression) {
   if (!cronExpression || cronExpression.trim() === "") {
     return false;
@@ -57,6 +79,7 @@ function validateCron(cronExpression) {
 export {
   getNextOccurrences,
   parseCronExpression,
-  validateCron
+  validateCron,
+  validateCronExpression
 };
 //# sourceMappingURL=cronParser.js.map

package/dist/modules/scheduler/lib/cronParser.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../src/modules/scheduler/lib/cronParser.ts"],
-  "sourcesContent": ["import { CronExpressionParser } from 'cron-parser'\n\nconst parseExpression = CronExpressionParser.parse.bind(CronExpressionParser)\n\nexport interface CronParseResult {\n  isValid: boolean\n  nextRun?: Date\n  error?: string\n}\n\n/**\n * Parse and validate a cron expression\n */\nexport function parseCronExpression(\n  cronExpression: string,\n  timezone: string = 'UTC',\n  currentDate?: Date\n): CronParseResult {\n  // Explicitly reject empty strings\n  if (!cronExpression || cronExpression.trim() === '') {\n    return {\n      isValid: false,\n      error: 'Cron expression cannot be empty',\n    }\n  }\n  \n  try {\n    const interval = parseExpression(cronExpression, {\n      currentDate: currentDate || new Date(),\n      tz: timezone,\n    })\n    \n    const nextRun = interval.next().toDate()\n    \n    return {\n      isValid: true,\n      nextRun,\n    }\n  } catch (error) {\n    return {\n      isValid: false,\n      error: error instanceof Error ? error.message : 'Invalid cron expression',\n    }\n  }\n}\n\n/**\n * Get the next N occurrences of a cron expression\n */\nexport function getNextOccurrences(\n  cronExpression: string,\n  count: number,\n  timezone: string = 'UTC',\n  currentDate?: Date\n): Date[] {\n  try {\n    const interval = parseExpression(cronExpression, {\n      currentDate: currentDate || new Date(),\n      tz: timezone,\n    })\n    \n    const occurrences: Date[] = []\n    for (let i = 0; i < count; i++) {\n      occurrences.push(interval.next().toDate())\n    }\n    \n    return occurrences\n  } catch (error) {\n    return []\n  }\n}\n\n/**\n * Validate a cron expression\n * Only supports standard 5-field cron format (minute hour day month weekday)\n */\nexport function validateCron(cronExpression: string): boolean {\n  // Explicitly reject empty strings\n  if (!cronExpression || cronExpression.trim() === '') {\n    return false\n  }\n  \n  // Check for exactly 5 fields (standard cron format)\n  // Split by whitespace and filter out empty strings\n  const fields = cronExpression.trim().split(/\\s+/).filter(f => f.length > 0)\n  if (fields.length !== 5) {\n    return false\n  }\n  \n  try {\n    parseExpression(cronExpression)\n    return true\n  } catch {\n    return false\n  }\n}\n"],
-  "mappings": "AAAA,SAAS,4BAA4B;AAErC,MAAM,kBAAkB,qBAAqB,MAAM,KAAK,oBAAoB;AAWrE,SAAS,oBACd,gBACA,WAAmB,OACnB,aACiB;AAEjB,MAAI,CAAC,kBAAkB,eAAe,KAAK,MAAM,IAAI;AACnD,WAAO;AAAA,MACL,SAAS;AAAA,MACT,OAAO;AAAA,IACT;AAAA,EACF;AAEA,MAAI;AACF,UAAM,WAAW,gBAAgB,gBAAgB;AAAA,MAC/C,aAAa,eAAe,oBAAI,KAAK;AAAA,MACrC,IAAI;AAAA,IACN,CAAC;AAED,UAAM,UAAU,SAAS,KAAK,EAAE,OAAO;AAEvC,WAAO;AAAA,MACL,SAAS;AAAA,MACT;AAAA,IACF;AAAA,EACF,SAAS,OAAO;AACd,WAAO;AAAA,MACL,SAAS;AAAA,MACT,OAAO,iBAAiB,QAAQ,MAAM,UAAU;AAAA,IAClD;AAAA,EACF;AACF;AAKO,SAAS,mBACd,gBACA,OACA,WAAmB,OACnB,aACQ;AACR,MAAI;AACF,UAAM,WAAW,gBAAgB,gBAAgB;AAAA,MAC/C,aAAa,eAAe,oBAAI,KAAK;AAAA,MACrC,IAAI;AAAA,IACN,CAAC;AAED,UAAM,cAAsB,CAAC;AAC7B,aAAS,IAAI,GAAG,IAAI,OAAO,KAAK;AAC9B,kBAAY,KAAK,SAAS,KAAK,EAAE,OAAO,CAAC;AAAA,IAC3C;AAEA,WAAO;AAAA,EACT,SAAS,OAAO;AACd,WAAO,CAAC;AAAA,EACV;AACF;AAMO,SAAS,aAAa,gBAAiC;AAE5D,MAAI,CAAC,kBAAkB,eAAe,KAAK,MAAM,IAAI;AACnD,WAAO;AAAA,EACT;AAIA,QAAM,SAAS,eAAe,KAAK,EAAE,MAAM,KAAK,EAAE,OAAO,OAAK,EAAE,SAAS,CAAC;AAC1E,MAAI,OAAO,WAAW,GAAG;AACvB,WAAO;AAAA,EACT;AAEA,MAAI;AACF,oBAAgB,cAAc;AAC9B,WAAO;AAAA,EACT,QAAQ;AACN,WAAO;AAAA,EACT;AACF;",
+  "sourcesContent": ["import { CronExpressionParser } from 'cron-parser'\n\nconst parseExpression = CronExpressionParser.parse.bind(CronExpressionParser)\n\nexport interface CronParseResult {\n  isValid: boolean\n  nextRun?: Date\n  error?: string\n}\n\n/**\n * Parse and validate a cron expression\n */\nexport function parseCronExpression(\n  cronExpression: string,\n  timezone: string = 'UTC',\n  currentDate?: Date\n): CronParseResult {\n  // Explicitly reject empty strings\n  if (!cronExpression || cronExpression.trim() === '') {\n    return {\n      isValid: false,\n      error: 'Cron expression cannot be empty',\n    }\n  }\n  \n  try {\n    const interval = parseExpression(cronExpression, {\n      currentDate: currentDate || new Date(),\n      tz: timezone,\n    })\n    \n    const nextRun = interval.next().toDate()\n    \n    return {\n      isValid: true,\n      nextRun,\n    }\n  } catch (error) {\n    return {\n      isValid: false,\n      error: error instanceof Error ? error.message : 'Invalid cron expression',\n    }\n  }\n}\n\n/**\n * Get the next N occurrences of a cron expression\n */\nexport function getNextOccurrences(\n  cronExpression: string,\n  count: number,\n  timezone: string = 'UTC',\n  currentDate?: Date\n): Date[] {\n  try {\n    const interval = parseExpression(cronExpression, {\n      currentDate: currentDate || new Date(),\n      tz: timezone,\n    })\n    \n    const occurrences: Date[] = []\n    for (let i = 0; i < count; i++) {\n      occurrences.push(interval.next().toDate())\n    }\n    \n    return occurrences\n  } catch (error) {\n    return []\n  }\n}\n\nexport interface CronValidationResult {\n  ok: boolean\n  nextRuns?: Date[]\n  error?: string\n}\n\n/**\n * Semantic cron validation with upcoming occurrences \u2014 the one-call helper for\n * form previews and server-side validators. Accepts anything cron-parser can\n * schedule (standard 5-field and 6-field-with-seconds expressions); a shape\n * that merely LOOKS like cron (`foo bar baz qux quux`) fails here even though\n * it passes token-count regexes.\n */\nexport function validateCronExpression(\n  cronExpression: string,\n  options: { count?: number; timezone?: string; currentDate?: Date } = {}\n): CronValidationResult {\n  if (!cronExpression || cronExpression.trim() === '') {\n    return { ok: false, error: 'Cron expression cannot be empty' }\n  }\n  const count = Math.max(1, Math.min(options.count ?? 3, 10))\n  try {\n    const interval = parseExpression(cronExpression, {\n      currentDate: options.currentDate || new Date(),\n      tz: options.timezone ?? 'UTC',\n    })\n    const nextRuns: Date[] = []\n    for (let i = 0; i < count; i++) {\n      nextRuns.push(interval.next().toDate())\n    }\n    return { ok: true, nextRuns }\n  } catch (error) {\n    return {\n      ok: false,\n      error: error instanceof Error ? error.message : 'Invalid cron expression',\n    }\n  }\n}\n\n/**\n * Validate a cron expression\n * Only supports standard 5-field cron format (minute hour day month weekday)\n */\nexport function validateCron(cronExpression: string): boolean {\n  // Explicitly reject empty strings\n  if (!cronExpression || cronExpression.trim() === '') {\n    return false\n  }\n  \n  // Check for exactly 5 fields (standard cron format)\n  // Split by whitespace and filter out empty strings\n  const fields = cronExpression.trim().split(/\\s+/).filter(f => f.length > 0)\n  if (fields.length !== 5) {\n    return false\n  }\n  \n  try {\n    parseExpression(cronExpression)\n    return true\n  } catch {\n    return false\n  }\n}\n"],
+  "mappings": "AAAA,SAAS,4BAA4B;AAErC,MAAM,kBAAkB,qBAAqB,MAAM,KAAK,oBAAoB;AAWrE,SAAS,oBACd,gBACA,WAAmB,OACnB,aACiB;AAEjB,MAAI,CAAC,kBAAkB,eAAe,KAAK,MAAM,IAAI;AACnD,WAAO;AAAA,MACL,SAAS;AAAA,MACT,OAAO;AAAA,IACT;AAAA,EACF;AAEA,MAAI;AACF,UAAM,WAAW,gBAAgB,gBAAgB;AAAA,MAC/C,aAAa,eAAe,oBAAI,KAAK;AAAA,MACrC,IAAI;AAAA,IACN,CAAC;AAED,UAAM,UAAU,SAAS,KAAK,EAAE,OAAO;AAEvC,WAAO;AAAA,MACL,SAAS;AAAA,MACT;AAAA,IACF;AAAA,EACF,SAAS,OAAO;AACd,WAAO;AAAA,MACL,SAAS;AAAA,MACT,OAAO,iBAAiB,QAAQ,MAAM,UAAU;AAAA,IAClD;AAAA,EACF;AACF;AAKO,SAAS,mBACd,gBACA,OACA,WAAmB,OACnB,aACQ;AACR,MAAI;AACF,UAAM,WAAW,gBAAgB,gBAAgB;AAAA,MAC/C,aAAa,eAAe,oBAAI,KAAK;AAAA,MACrC,IAAI;AAAA,IACN,CAAC;AAED,UAAM,cAAsB,CAAC;AAC7B,aAAS,IAAI,GAAG,IAAI,OAAO,KAAK;AAC9B,kBAAY,KAAK,SAAS,KAAK,EAAE,OAAO,CAAC;AAAA,IAC3C;AAEA,WAAO;AAAA,EACT,SAAS,OAAO;AACd,WAAO,CAAC;AAAA,EACV;AACF;AAeO,SAAS,uBACd,gBACA,UAAqE,CAAC,GAChD;AACtB,MAAI,CAAC,kBAAkB,eAAe,KAAK,MAAM,IAAI;AACnD,WAAO,EAAE,IAAI,OAAO,OAAO,kCAAkC;AAAA,EAC/D;AACA,QAAM,QAAQ,KAAK,IAAI,GAAG,KAAK,IAAI,QAAQ,SAAS,GAAG,EAAE,CAAC;AAC1D,MAAI;AACF,UAAM,WAAW,gBAAgB,gBAAgB;AAAA,MAC/C,aAAa,QAAQ,eAAe,oBAAI,KAAK;AAAA,MAC7C,IAAI,QAAQ,YAAY;AAAA,IAC1B,CAAC;AACD,UAAM,WAAmB,CAAC;AAC1B,aAAS,IAAI,GAAG,IAAI,OAAO,KAAK;AAC9B,eAAS,KAAK,SAAS,KAAK,EAAE,OAAO,CAAC;AAAA,IACxC;AACA,WAAO,EAAE,IAAI,MAAM,SAAS;AAAA,EAC9B,SAAS,OAAO;AACd,WAAO;AAAA,MACL,IAAI;AAAA,MACJ,OAAO,iBAAiB,QAAQ,MAAM,UAAU;AAAA,IAClD;AAAA,EACF;AACF;AAMO,SAAS,aAAa,gBAAiC;AAE5D,MAAI,CAAC,kBAAkB,eAAe,KAAK,MAAM,IAAI;AACnD,WAAO;AAAA,EACT;AAIA,QAAM,SAAS,eAAe,KAAK,EAAE,MAAM,KAAK,EAAE,OAAO,OAAK,EAAE,SAAS,CAAC;AAC1E,MAAI,OAAO,WAAW,GAAG;AACvB,WAAO;AAAA,EACT;AAEA,MAAI;AACF,oBAAgB,cAAc;AAC9B,WAAO;AAAA,EACT,QAAQ;AACN,WAAO;AAAA,EACT;AACF;",
   "names": []
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@open-mercato/scheduler",
-  "version": "0.7.1-develop.7193.1.910a5b0a1e",
+  "version": "0.7.1-develop.7194.1.ab4fc81f82",
   "license": "MIT",
   "description": "Database-managed scheduled jobs with admin UI",
   "type": "module",
@@ -59,13 +59,13 @@
     "./*/*/*/*/*/*.json": "./src/*/*/*/*/*/*.json"
   },
   "dependencies": {
-    "@open-mercato/events": "0.7.1-develop.7193.1.910a5b0a1e",
-    "@open-mercato/queue": "0.7.1-develop.7193.1.910a5b0a1e",
+    "@open-mercato/events": "0.7.1-develop.7194.1.ab4fc81f82",
+    "@open-mercato/queue": "0.7.1-develop.7194.1.ab4fc81f82",
     "cron-parser": "^5.6.2"
   },
   "peerDependencies": {
     "@mikro-orm/core": "^7.0.14",
-    "@open-mercato/shared": "0.7.1-develop.7193.1.910a5b0a1e",
+    "@open-mercato/shared": "0.7.1-develop.7194.1.ab4fc81f82",
     "bullmq": "^5.0.0 || ^6.0.0",
     "ioredis": "^5.0.0 || ^6.0.0",
     "zod": ">=3.23.0"
@@ -79,7 +79,7 @@
     }
   },
   "devDependencies": {
-    "@open-mercato/shared": "0.7.1-develop.7193.1.910a5b0a1e",
+    "@open-mercato/shared": "0.7.1-develop.7194.1.ab4fc81f82",
     "@types/jest": "^30.0.0",
     "@types/node": "^26.4.0",
     "jest": "^30.4.2",

package/src/index.ts

@@ -9,6 +9,7 @@ export { SchedulerService } from './modules/scheduler/services/schedulerService.
 export type { ScheduleRegistration } from './modules/scheduler/services/schedulerService.js'
 
 // Parsers and utilities
-export { parseCronExpression, validateCron } from './modules/scheduler/lib/cronParser.js'
+export { parseCronExpression, validateCron, validateCronExpression } from './modules/scheduler/lib/cronParser.js'
+export type { CronValidationResult } from './modules/scheduler/lib/cronParser.js'
 export { parseInterval, validateInterval, intervalToHuman } from './modules/scheduler/lib/intervalParser.js'
 export { calculateNextRun, recalculateNextRun } from './modules/scheduler/lib/nextRunCalculator.js'

package/src/modules/scheduler/lib/__tests__/cronParser.test.ts

@@ -1,5 +1,5 @@
 import { describe, it, expect } from '@jest/globals'
-import { parseCronExpression, getNextOccurrences, validateCron } from '../cronParser'
+import { parseCronExpression, getNextOccurrences, validateCron, validateCronExpression } from '../cronParser'
 
 describe('cronParser', () => {
   describe('parseCronExpression', () => {
@@ -241,4 +241,54 @@ describe('cronParser', () => {
       expect(nextRun.getUTCDate()).toBe(1)
     })
   })
+
+  describe('validateCronExpression', () => {
+    it('returns ok with three upcoming runs by default for a valid expression', () => {
+      const result = validateCronExpression('0 7 * * 1')
+
+      expect(result.ok).toBe(true)
+      expect(result.error).toBeUndefined()
+      expect(result.nextRuns).toHaveLength(3)
+      for (const run of result.nextRuns!) {
+        expect(run).toBeInstanceOf(Date)
+      }
+      expect(result.nextRuns![0].getTime()).toBeLessThan(result.nextRuns![1].getTime())
+      expect(result.nextRuns![1].getTime()).toBeLessThan(result.nextRuns![2].getTime())
+    })
+
+    it('rejects shape-valid garbage that token-count regexes accept', () => {
+      const result = validateCronExpression('foo bar baz qux quux')
+
+      expect(result.ok).toBe(false)
+      expect(result.nextRuns).toBeUndefined()
+      expect(result.error).toBeTruthy()
+    })
+
+    it('rejects empty input', () => {
+      expect(validateCronExpression('').ok).toBe(false)
+      expect(validateCronExpression('   ').ok).toBe(false)
+    })
+
+    it('honors a custom count (clamped to 1..10)', () => {
+      expect(validateCronExpression('*/5 * * * *', { count: 5 }).nextRuns).toHaveLength(5)
+      expect(validateCronExpression('*/5 * * * *', { count: 0 }).nextRuns).toHaveLength(1)
+      expect(validateCronExpression('*/5 * * * *', { count: 99 }).nextRuns).toHaveLength(10)
+    })
+
+    it('computes occurrences in the requested timezone from a fixed date', () => {
+      const currentDate = new Date('2026-01-01T00:00:00Z')
+      const result = validateCronExpression('0 12 * * *', { timezone: 'America/New_York', currentDate, count: 1 })
+
+      expect(result.ok).toBe(true)
+      // Noon in New York (EST, UTC-5) is 17:00 UTC.
+      expect(result.nextRuns![0].toISOString()).toBe('2026-01-01T17:00:00.000Z')
+    })
+
+    it('accepts 6-field (seconds) expressions that cron-parser schedules', () => {
+      const result = validateCronExpression('*/30 * * * * *', { count: 2 })
+
+      expect(result.ok).toBe(true)
+      expect(result.nextRuns).toHaveLength(2)
+    })
+  })
 })

package/src/modules/scheduler/lib/cronParser.ts

@@ -70,6 +70,45 @@ export function getNextOccurrences(
   }
 }
 
+export interface CronValidationResult {
+  ok: boolean
+  nextRuns?: Date[]
+  error?: string
+}
+
+/**
+ * Semantic cron validation with upcoming occurrences — the one-call helper for
+ * form previews and server-side validators. Accepts anything cron-parser can
+ * schedule (standard 5-field and 6-field-with-seconds expressions); a shape
+ * that merely LOOKS like cron (`foo bar baz qux quux`) fails here even though
+ * it passes token-count regexes.
+ */
+export function validateCronExpression(
+  cronExpression: string,
+  options: { count?: number; timezone?: string; currentDate?: Date } = {}
+): CronValidationResult {
+  if (!cronExpression || cronExpression.trim() === '') {
+    return { ok: false, error: 'Cron expression cannot be empty' }
+  }
+  const count = Math.max(1, Math.min(options.count ?? 3, 10))
+  try {
+    const interval = parseExpression(cronExpression, {
+      currentDate: options.currentDate || new Date(),
+      tz: options.timezone ?? 'UTC',
+    })
+    const nextRuns: Date[] = []
+    for (let i = 0; i < count; i++) {
+      nextRuns.push(interval.next().toDate())
+    }
+    return { ok: true, nextRuns }
+  } catch (error) {
+    return {
+      ok: false,
+      error: error instanceof Error ? error.message : 'Invalid cron expression',
+    }
+  }
+}
+
 /**
  * Validate a cron expression
  * Only supports standard 5-field cron format (minute hour day month weekday)