Comparing version 5.38.0 to 5.39.0
@@ -17,3 +17,3 @@ "use strict"; | ||
async upsertJobScheduler(jobSchedulerId, repeatOpts, jobName, jobData, opts, { override, producerId }) { | ||
const { every, pattern, offset } = repeatOpts; | ||
const { every, limit, pattern, offset } = repeatOpts; | ||
if (pattern && every) { | ||
@@ -96,2 +96,3 @@ throw new Error('Both .pattern and .every options are defined for this repeatable job'); | ||
every, | ||
limit, | ||
}, job_1.Job.optsAsJSON(mergedOpts), producerId); | ||
@@ -147,7 +148,29 @@ const job = new this.Job(this, jobName, jobData, mergedOpts, jobId); | ||
if (jobData) { | ||
return Object.assign(Object.assign({ key, iterationCount: parseInt(jobData.ic) || null, name: jobData.name, endDate: parseInt(jobData.endDate) || null, tz: jobData.tz || null, pattern: jobData.pattern || null, every: jobData.every || null }, (jobData.data || jobData.opts | ||
? { | ||
template: this.getTemplateFromJSON(jobData.data, jobData.opts), | ||
} | ||
: {})), { next }); | ||
const jobSchedulerData = { | ||
key, | ||
name: jobData.name, | ||
next, | ||
}; | ||
if (jobData.ic) { | ||
jobSchedulerData.iterationCount = parseInt(jobData.ic); | ||
} | ||
if (jobData.limit) { | ||
jobSchedulerData.limit = parseInt(jobData.limit); | ||
} | ||
if (jobData.endDate) { | ||
jobSchedulerData.endDate = parseInt(jobData.endDate); | ||
} | ||
if (jobData.tz) { | ||
jobSchedulerData.tz = jobData.tz; | ||
} | ||
if (jobData.pattern) { | ||
jobSchedulerData.pattern = jobData.pattern; | ||
} | ||
if (jobData.every) { | ||
jobSchedulerData.every = jobData.every; | ||
} | ||
if (jobData.data || jobData.opts) { | ||
jobSchedulerData.template = this.getTemplateFromJSON(jobData.data, jobData.opts); | ||
} | ||
return jobSchedulerData; | ||
} | ||
@@ -154,0 +177,0 @@ return this.keyToData(key, next); |
@@ -307,2 +307,6 @@ "use strict"; | ||
end | ||
if opts['limit'] then | ||
table.insert(optionalValues, "limit") | ||
table.insert(optionalValues, opts['limit']) | ||
end | ||
if opts['pattern'] then | ||
@@ -309,0 +313,0 @@ table.insert(optionalValues, "pattern") |
"use strict"; | ||
Object.defineProperty(exports, "__esModule", { value: true }); | ||
exports.version = void 0; | ||
exports.version = '5.38.0'; | ||
exports.version = '5.39.0'; | ||
//# sourceMappingURL=version.js.map |
@@ -14,3 +14,3 @@ import { __rest } from "tslib"; | ||
async upsertJobScheduler(jobSchedulerId, repeatOpts, jobName, jobData, opts, { override, producerId }) { | ||
const { every, pattern, offset } = repeatOpts; | ||
const { every, limit, pattern, offset } = repeatOpts; | ||
if (pattern && every) { | ||
@@ -93,2 +93,3 @@ throw new Error('Both .pattern and .every options are defined for this repeatable job'); | ||
every, | ||
limit, | ||
}, Job.optsAsJSON(mergedOpts), producerId); | ||
@@ -144,7 +145,29 @@ const job = new this.Job(this, jobName, jobData, mergedOpts, jobId); | ||
if (jobData) { | ||
return Object.assign(Object.assign({ key, iterationCount: parseInt(jobData.ic) || null, name: jobData.name, endDate: parseInt(jobData.endDate) || null, tz: jobData.tz || null, pattern: jobData.pattern || null, every: jobData.every || null }, (jobData.data || jobData.opts | ||
? { | ||
template: this.getTemplateFromJSON(jobData.data, jobData.opts), | ||
} | ||
: {})), { next }); | ||
const jobSchedulerData = { | ||
key, | ||
name: jobData.name, | ||
next, | ||
}; | ||
if (jobData.ic) { | ||
jobSchedulerData.iterationCount = parseInt(jobData.ic); | ||
} | ||
if (jobData.limit) { | ||
jobSchedulerData.limit = parseInt(jobData.limit); | ||
} | ||
if (jobData.endDate) { | ||
jobSchedulerData.endDate = parseInt(jobData.endDate); | ||
} | ||
if (jobData.tz) { | ||
jobSchedulerData.tz = jobData.tz; | ||
} | ||
if (jobData.pattern) { | ||
jobSchedulerData.pattern = jobData.pattern; | ||
} | ||
if (jobData.every) { | ||
jobSchedulerData.every = jobData.every; | ||
} | ||
if (jobData.data || jobData.opts) { | ||
jobSchedulerData.template = this.getTemplateFromJSON(jobData.data, jobData.opts); | ||
} | ||
return jobSchedulerData; | ||
} | ||
@@ -151,0 +174,0 @@ return this.keyToData(key, next); |
@@ -11,8 +11,9 @@ import { JobSchedulerTemplateOptions } from '../types'; | ||
iterationCount?: number; | ||
endDate: number | null; | ||
tz: string | null; | ||
pattern: string | null; | ||
every?: string | null; | ||
limit?: number; | ||
endDate?: number; | ||
tz?: string; | ||
pattern?: string; | ||
every?: string; | ||
next?: number; | ||
template?: JobSchedulerTemplateJson<D>; | ||
} |
@@ -5,4 +5,5 @@ export type RepeatableOptions = { | ||
tz?: string; | ||
limit?: number; | ||
pattern?: string; | ||
every?: number; | ||
}; |
@@ -304,2 +304,6 @@ const content = `--[[ | ||
end | ||
if opts['limit'] then | ||
table.insert(optionalValues, "limit") | ||
table.insert(optionalValues, opts['limit']) | ||
end | ||
if opts['pattern'] then | ||
@@ -306,0 +310,0 @@ table.insert(optionalValues, "pattern") |
@@ -1,1 +0,1 @@ | ||
export declare const version = "5.38.0"; | ||
export declare const version = "5.39.0"; |
@@ -1,2 +0,2 @@ | ||
export const version = '5.38.0'; | ||
export const version = '5.39.0'; | ||
//# sourceMappingURL=version.js.map |
{ | ||
"name": "bullmq", | ||
"version": "5.38.0", | ||
"version": "5.39.0", | ||
"description": "Queue for messages and jobs based on Redis", | ||
@@ -5,0 +5,0 @@ "homepage": "https://bullmq.io/", |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
1958280
31580