npm - payload - Versions diffs - 3.91.0-internal.c1569dc → 4.0.0-beta.0 - Mend

payload 3.91.0-internal.c1569dc → 4.0.0-beta.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (2454) hide show

package/dist/queues/operations/runJobs/runJSONJob/index.js CHANGED Viewed

@@ -1,5 +1,5 @@
 import { handleWorkflowError } from '../../../errors/handleWorkflowError.js';
-import { WorkflowError } from '../../../errors/index.js';
+import { JobCancelledError, JobRunAbortedError, WorkflowError } from '../../../errors/index.js';
 import { getCurrentDate } from '../../../utilities/getCurrentDate.js';
 import { getRunTaskFunction } from '../runJob/getRunTaskFunction.js';
 export const runJSONJob = async ({ job, req, silent = false, updateJob, workflowConfig, workflowHandler })=>{
@@ -41,6 +41,9 @@ export const runJSONJob = async ({ job, req, silent = false, updateJob, workflow
             }
         }));
     } catch (error) {
+        if (error instanceof JobCancelledError || error instanceof JobRunAbortedError) {
+            throw error;
+        }
         const { hasFinalError } = await handleWorkflowError({
             error: error instanceof WorkflowError ? error : new WorkflowError({
                 job,
@@ -77,14 +80,14 @@ export const runJSONJob = async ({ job, req, silent = false, updateJob, workflow
     if (workflowCompleted) {
         await updateJob({
             completedAt: getCurrentDate().toISOString(),
-            processing: false,
+            processingUntil: null,
             totalTried: (job.totalTried ?? 0) + 1
         });
         return {
             status: 'success'
         };
     } else {
-        // Retry the job - no need to bump processing or totalTried as this does not count as a retry. A condition of a different task might have just opened up!
+        // Retry the job - no need to bump processingUntil or totalTried as this does not count as a retry. A condition of a different task might have just opened up!
         return await runJSONJob({
             job,
             req,

package/dist/queues/operations/runJobs/runJSONJob/index.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"sources":["../../../../../src/queues/operations/runJobs/runJSONJob/index.ts"],"sourcesContent":["import type { Job } from '../../../../index.js'\nimport type { PayloadRequest } from '../../../../types/index.js'\nimport type { WorkflowJSON, WorkflowStep } from '../../../config/types/workflowJSONTypes.js'\nimport type { WorkflowConfig } from '../../../config/types/workflowTypes.js'\nimport type { RunJobsSilent } from '../../../localAPI.js'\nimport type { UpdateJobFunction } from '../runJob/getUpdateJobFunction.js'\nimport type { JobRunStatus } from '../runJob/index.js'\n\nimport { handleWorkflowError } from '../../../errors/handleWorkflowError.js'\nimport { WorkflowError } from '../../../errors/index.js'\nimport { getCurrentDate } from '../../../utilities/getCurrentDate.js'\nimport { getRunTaskFunction } from '../runJob/getRunTaskFunction.js'\n\ntype Args = {\n job: Job\n req: PayloadRequest\n /*\n If set to true, the job system will not log any output to the console (for both info and error logs).\n * Can be an option for more granular control over logging.\n \n This will not automatically affect user-configured logs (e.g. if you call `console.log` or `payload.logger.info` in your job code).\n \n @default false\n */\n silent?: RunJobsSilent\n updateJob: UpdateJobFunction\n workflowConfig: WorkflowConfig\n workflowHandler: WorkflowJSON\n}\n\nexport type RunJSONJobResult = {\n status: JobRunStatus\n}\n\nexport const runJSONJob = async ({\n job,\n req,\n silent = false,\n updateJob,\n workflowConfig,\n workflowHandler,\n}: Args): Promise<RunJSONJobResult> => {\n const stepsToRun: WorkflowStep<string>[] = []\n\n for (const step of workflowHandler) {\n if ('task' in step) {\n if (job?.taskStatus?.[step.task]?.[step.id]?.complete) {\n continue\n }\n } else {\n if (job?.taskStatus?.['inline']?.[step.id]?.complete) {\n continue\n }\n }\n if (step.condition && !step.condition({ job })) {\n continue\n }\n stepsToRun.push(step)\n }\n\n const tasks = getRunTaskFunction(job, workflowConfig, req, false, updateJob)\n const inlineTask = getRunTaskFunction(job, workflowConfig, req, true, updateJob)\n\n // Run the job\n try {\n await Promise.all(\n stepsToRun.map(async (step) => {\n if ('task' in step) {\n await tasks[step.task]!(step.id, {\n input: step.input ? step.input({ job }) : {},\n retries: step.retries,\n })\n } else {\n await inlineTask(step.id, {\n retries: step.retries,\n task: step.inlineTask ~~as any, // TODO: Fix type\~~n })\n }\n }),\n )\n } catch (error) {\n const { hasFinalError } = await handleWorkflowError({\n error:\n error instanceof WorkflowError\n ? error\n : new WorkflowError({\n job,\n message:\n typeof error === 'object' && error && 'message' in error\n ? (error.message as string)\n : 'An unhandled error occurred',\n workflowConfig,\n }),\n silent,\n\n req,\n updateJob,\n })\n\n return {\n status: hasFinalError ? 'error-reached-max-retries' : 'error',\n }\n }\n\n // Check if workflow has completed\n let workflowCompleted = false\n for (const [slug, map] of Object.entries(job.taskStatus)) {\n for (const [id, taskStatus] of Object.entries(map)) {\n if (taskStatus.complete) {\n const step = workflowHandler.find((step) => {\n if ('task' in step) {\n return step.task === slug && step.id === id\n } else {\n return step.id === id && slug === 'inline'\n }\n })\n if (step?.completesJob) {\n workflowCompleted = true\n break\n }\n }\n }\n }\n\n if (workflowCompleted) {\n await updateJob({\n completedAt: getCurrentDate().toISOString(),\n ~~processing~~: ~~false~~,\n totalTried: (job.totalTried ?? 0) + 1,\n })\n\n return {\n status: 'success',\n }\n } else {\n // Retry the job - no need to bump ~~processing~~ or totalTried as this does not count as a retry. A condition of a different task might have just opened up!\n return await runJSONJob({\n job,\n req,\n silent,\n updateJob,\n workflowConfig,\n workflowHandler,\n })\n }\n}\n"],"names":["handleWorkflowError","WorkflowError","getCurrentDate","getRunTaskFunction","runJSONJob","job","req","silent","updateJob","workflowConfig","workflowHandler","stepsToRun","step","taskStatus","task","id","complete","condition","push","tasks","inlineTask","Promise","all","map","input","retries","error","hasFinalError","message","status","workflowCompleted","slug","Object","entries","find","completesJob","completedAt","toISOString","~~processing~~","totalTried"],"mappings":"AAQA,SAASA,mBAAmB,QAAQ,yCAAwC;AAC5E,SAASC,aAAa,QAAQ,2BAA0B;~~AACxD~~,SAASC,cAAc,QAAQ,uCAAsC;AACrE,SAASC,kBAAkB,QAAQ,kCAAiC;AAuBpE,OAAO,MAAMC,aAAa,OAAO,EAC/BC,GAAG,EACHC,GAAG,EACHC,SAAS,KAAK,EACdC,SAAS,EACTC,cAAc,EACdC,eAAe,EACV;IACL,MAAMC,aAAqC,EAAE;IAE7C,KAAK,MAAMC,QAAQF,gBAAiB;QAClC,IAAI,UAAUE,MAAM;YAClB,IAAIP,KAAKQ,YAAY,CAACD,KAAKE,IAAI,CAAC,EAAE,CAACF,KAAKG,EAAE,CAAC,EAAEC,UAAU;gBACrD;YACF;QACF,OAAO;YACL,IAAIX,KAAKQ,YAAY,CAAC,SAAS,EAAE,CAACD,KAAKG,EAAE,CAAC,EAAEC,UAAU;gBACpD;YACF;QACF;QACA,IAAIJ,KAAKK,SAAS,IAAI,CAACL,KAAKK,SAAS,CAAC;YAAEZ;QAAI,IAAI;YAC9C;QACF;QACAM,WAAWO,IAAI,CAACN;IAClB;IAEA,MAAMO,QAAQhB,mBAAmBE,KAAKI,gBAAgBH,KAAK,OAAOE;IAClE,MAAMY,aAAajB,mBAAmBE,KAAKI,gBAAgBH,KAAK,MAAME;IAEtE,cAAc;IACd,IAAI;QACF,MAAMa,QAAQC,GAAG,CACfX,WAAWY,GAAG,CAAC,OAAOX;YACpB,IAAI,UAAUA,MAAM;gBAClB,MAAMO,KAAK,CAACP,KAAKE,IAAI,CAAC,CAAEF,KAAKG,EAAE,EAAE;oBAC/BS,OAAOZ,KAAKY,KAAK,GAAGZ,KAAKY,KAAK,CAAC;wBAAEnB;oBAAI,KAAK,CAAC;oBAC3CoB,SAASb,KAAKa,OAAO;gBACvB;YACF,OAAO;gBACL,MAAML,WAAWR,KAAKG,EAAE,EAAE;oBACxBU,SAASb,KAAKa,OAAO;oBACrBX,MAAMF,KAAKQ,UAAU;gBACvB;YACF;QACF;IAEJ,EAAE,OAAOM,OAAO;QACd,MAAM,EAAEC,aAAa,EAAE,GAAG,~~MAAM3B~~,oBAAoB;~~YAClD0B~~,OACEA,iBAAiBzB,gBACbyB,QACA,IAAIzB,cAAc;gBAChBI;gBACAuB,SACE,OAAOF,UAAU,YAAYA,SAAS,aAAaA,QAC9CA,MAAME,OAAO,GACd;gBACNnB;YACF;YACNF;YAEAD;YACAE;QACF;QAEA,OAAO;YACLqB,QAAQF,gBAAgB,8BAA8B;QACxD;IACF;IAEA,kCAAkC;IAClC,IAAIG,oBAAoB;IACxB,KAAK,MAAM,CAACC,MAAMR,IAAI,IAAIS,OAAOC,OAAO,CAAC5B,IAAIQ,UAAU,EAAG;QACxD,KAAK,MAAM,CAACE,IAAIF,WAAW,IAAImB,OAAOC,OAAO,CAACV,KAAM;YAClD,IAAIV,WAAWG,QAAQ,EAAE;gBACvB,MAAMJ,OAAOF,gBAAgBwB,IAAI,CAAC,CAACtB;oBACjC,IAAI,UAAUA,MAAM;wBAClB,OAAOA,KAAKE,IAAI,KAAKiB,QAAQnB,KAAKG,EAAE,KAAKA;oBAC3C,OAAO;wBACL,OAAOH,KAAKG,EAAE,KAAKA,MAAMgB,SAAS;oBACpC;gBACF;gBACA,IAAInB,MAAMuB,cAAc;oBACtBL,oBAAoB;oBACpB;gBACF;YACF;QACF;IACF;IAEA,IAAIA,mBAAmB;QACrB,MAAMtB,UAAU;YACd4B,aAAalC,iBAAiBmC,WAAW;YACzCC,~~YAAY~~;~~YACZC~~,YAAY,AAAClC,CAAAA,IAAIkC,UAAU,IAAI,CAAA,IAAK;QACtC;QAEA,OAAO;YACLV,QAAQ;QACV;IACF,OAAO;QACL,~~yJAAyJ~~;~~QACzJ~~,OAAO,MAAMzB,WAAW;YACtBC;YACAC;YACAC;YACAC;YACAC;YACAC;QACF;IACF;AACF,EAAC"}
1	+ {"version":3,"sources":["../../../../../src/queues/operations/runJobs/runJSONJob/index.ts"],"sourcesContent":["import type { Job } from '../../../../index.js'\nimport type { PayloadRequest } from '../../../../types/index.js'\nimport type { WorkflowJSON, WorkflowStep } from '../../../config/types/workflowJSONTypes.js'\nimport type { WorkflowConfig } from '../../../config/types/workflowTypes.js'\nimport type { RunJobsSilent } from '../../../localAPI.js'\nimport type { UpdateJobFunction } from '../runJob/getUpdateJobFunction.js'\nimport type { JobRunStatus } from '../runJob/index.js'\n\nimport { handleWorkflowError } from '../../../errors/handleWorkflowError.js'\nimport { JobCancelledError, JobRunAbortedError, WorkflowError } from '../../../errors/index.js'\nimport { getCurrentDate } from '../../../utilities/getCurrentDate.js'\nimport { getRunTaskFunction } from '../runJob/getRunTaskFunction.js'\n\ntype Args = {\n job: Job\n req: PayloadRequest\n /*\n If set to true, the job system will not log any output to the console (for both info and error logs).\n * Can be an option for more granular control over logging.\n \n This will not automatically affect user-configured logs (e.g. if you call `console.log` or `payload.logger.info` in your job code).\n \n @default false\n */\n silent?: RunJobsSilent\n updateJob: UpdateJobFunction\n workflowConfig: WorkflowConfig\n workflowHandler: WorkflowJSON\n}\n\nexport type RunJSONJobResult = {\n status: JobRunStatus\n}\n\nexport const runJSONJob = async ({\n job,\n req,\n silent = false,\n updateJob,\n workflowConfig,\n workflowHandler,\n}: Args): Promise<RunJSONJobResult> => {\n const stepsToRun: WorkflowStep<string>[] = []\n\n for (const step of workflowHandler) {\n if ('task' in step) {\n if (job?.taskStatus?.[step.task]?.[step.id]?.complete) {\n continue\n }\n } else {\n if (job?.taskStatus?.['inline']?.[step.id]?.complete) {\n continue\n }\n }\n if (step.condition && !step.condition({ job })) {\n continue\n }\n stepsToRun.push(step)\n }\n\n const tasks = getRunTaskFunction(job, workflowConfig, req, false, updateJob)\n const inlineTask = getRunTaskFunction(job, workflowConfig, req, true, updateJob)\n\n // Run the job\n try {\n await Promise.all(\n stepsToRun.map(async (step) => {\n if ('task' in step) {\n await tasks[step.task]!(step.id, {\n input: step.input ? step.input({ job }) : {},\n retries: step.retries,\n })\n } else {\n await inlineTask(step.id, {\n retries: step.retries,\n task: step.inlineTask,\n })\n }\n }),\n )\n } catch (error) {\n if (error instanceof JobCancelledError \|\| error instanceof JobRunAbortedError) {\n throw error\n }\n\n const { hasFinalError } = await handleWorkflowError({\n error:\n error instanceof WorkflowError\n ? error\n : new WorkflowError({\n job,\n message:\n typeof error === 'object' && error && 'message' in error\n ? (error.message as string)\n : 'An unhandled error occurred',\n workflowConfig,\n }),\n silent,\n\n req,\n updateJob,\n })\n\n return {\n status: hasFinalError ? 'error-reached-max-retries' : 'error',\n }\n }\n\n // Check if workflow has completed\n let workflowCompleted = false\n for (const [slug, map] of Object.entries(job.taskStatus)) {\n for (const [id, taskStatus] of Object.entries(map)) {\n if (taskStatus.complete) {\n const step = workflowHandler.find((step) => {\n if ('task' in step) {\n return step.task === slug && step.id === id\n } else {\n return step.id === id && slug === 'inline'\n }\n })\n if (step?.completesJob) {\n workflowCompleted = true\n break\n }\n }\n }\n }\n\n if (workflowCompleted) {\n await updateJob({\n completedAt: getCurrentDate().toISOString(),\n processingUntil: null,\n totalTried: (job.totalTried ?? 0) + 1,\n })\n\n return {\n status: 'success',\n }\n } else {\n // Retry the job - no need to bump processingUntil or totalTried as this does not count as a retry. A condition of a different task might have just opened up!\n return await runJSONJob({\n job,\n req,\n silent,\n updateJob,\n workflowConfig,\n workflowHandler,\n })\n }\n}\n"],"names":["handleWorkflowError","JobCancelledError","JobRunAbortedError","WorkflowError","getCurrentDate","getRunTaskFunction","runJSONJob","job","req","silent","updateJob","workflowConfig","workflowHandler","stepsToRun","step","taskStatus","task","id","complete","condition","push","tasks","inlineTask","Promise","all","map","input","retries","error","hasFinalError","message","status","workflowCompleted","slug","Object","entries","find","completesJob","completedAt","toISOString","processingUntil","totalTried"],"mappings":"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"}

package/dist/queues/operations/runJobs/runJob/getRunTaskFunction.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"getRunTaskFunction.d.ts","sourceRoot":"","sources":["../../../../../src/queues/operations/runJobs/runJob/getRunTaskFunction.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,sBAAsB,CAAA;AAC/C,OAAO,KAAK,~~EAAc~~,cAAc,EAAE,MAAM,4BAA4B,CAAA;~~AAC5E~~,OAAO,KAAK,EAEV,qBAAqB,EAErB,gBAAgB,EAKjB,MAAM,oCAAoC,CAAA;AAC3C,OAAO,KAAK,EAGV,cAAc,EAEf,MAAM,wCAAwC,CAAA;AAC/C,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAA;AAQlE,MAAM,MAAM,UAAU,GAAG;IACvB,MAAM,EAAE,MAAM,CAAA;IACd,QAAQ,EAAE,MAAM,CAAA;CACjB,CAAA;AAED,eAAO,MAAM,kBAAkB,GAAI,SAAS,SAAS,OAAO,OACrD,GAAG,kBACQ,cAAc,OACzB,cAAc,YACT,SAAS,aACR,iBAAiB,WACnB,UAAU,KAClB,SAAS,SAAS,IAAI,GAAG,qBAAqB,GAAG,~~gBA4LnD~~,CAAA"}
1	+ {"version":3,"file":"getRunTaskFunction.d.ts","sourceRoot":"","sources":["../../../../../src/queues/operations/runJobs/runJob/getRunTaskFunction.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,sBAAsB,CAAA;AAC/C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAA;AAChE,OAAO,KAAK,EAEV,qBAAqB,EAErB,gBAAgB,EAKjB,MAAM,oCAAoC,CAAA;AAC3C,OAAO,KAAK,EAGV,cAAc,EAEf,MAAM,wCAAwC,CAAA;AAC/C,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAA;AAQlE,MAAM,MAAM,UAAU,GAAG;IACvB,MAAM,EAAE,MAAM,CAAA;IACd,QAAQ,EAAE,MAAM,CAAA;CACjB,CAAA;AAED,eAAO,MAAM,kBAAkB,GAAI,SAAS,SAAS,OAAO,OACrD,GAAG,kBACQ,cAAc,OACzB,cAAc,YACT,SAAS,aACR,iBAAiB,WACnB,UAAU,KAClB,SAAS,SAAS,IAAI,GAAG,qBAAqB,GAAG,gBA0KnD,CAAA"}

package/dist/queues/operations/runJobs/runJob/getRunTaskFunction.js CHANGED Viewed

@@ -1,5 +1,5 @@
 import ObjectIdImport from 'bson-objectid';
-import { JobCancelledError, TaskError } from '../../../errors/index.js';
+import { JobCancelledError, JobRunAbortedError, TaskError } from '../../../errors/index.js';
 import { getCurrentDate } from '../../../utilities/getCurrentDate.js';
 import { getTaskHandlerFromConfig } from './importHandlerPath.js';
 const ObjectId = 'default' in ObjectIdImport ? ObjectIdImport.default : ObjectIdImport;
@@ -59,10 +59,9 @@ export const getRunTaskFunction = (job, workflowConfig, req, isInline, updateJob
                     workflowConfig
                 });
             }
-            let taskHandlerResult;
-            let output = {};
+            let output;
             try {
-                taskHandlerResult = await runner({
+                output = (await runner({
                     inlineTask: getRunTaskFunction(job, workflowConfig, req, true, updateJob, {
                         taskID,
                         taskSlug
@@ -74,10 +73,10 @@ export const getRunTaskFunction = (job, workflowConfig, req, isInline, updateJob
                         taskID,
                         taskSlug
                     })
-                });
+                }))?.output;
             } catch (err) {
-                if (err instanceof JobCancelledError) {
-                    // Re-throw JobCancelledError to be handled by the top-level error handler
+                if (err instanceof JobCancelledError || err instanceof JobRunAbortedError) {
+                    // Job run aborts are handled by the top-level runner.
                     throw err;
                 }
                 throw new TaskError({
@@ -95,24 +94,6 @@ export const getRunTaskFunction = (job, workflowConfig, req, isInline, updateJob
                     workflowConfig
                 });
             }
-            if (taskHandlerResult.state === 'failed') {
-                throw new TaskError({
-                    executedAt,
-                    input: input,
-                    job,
-                    message: taskHandlerResult.errorMessage ?? 'Task handler returned a failed state',
-                    output,
-                    parent,
-                    retriesConfig: finalRetriesConfig,
-                    taskConfig,
-                    taskID,
-                    taskSlug,
-                    taskStatus,
-                    workflowConfig
-                });
-            } else {
-                output = taskHandlerResult.output;
-            }
             if (taskConfig?.onSuccess) {
                 await taskConfig.onSuccess({
                     input,
@@ -125,9 +106,9 @@ export const getRunTaskFunction = (job, workflowConfig, req, isInline, updateJob
                 id: new ObjectId().toHexString(),
                 completedAt: getCurrentDate().toISOString(),
                 executedAt: executedAt.toISOString(),
-                input,
+                input: input ?? {},
                 output,
-                parent: jobConfig.addParentToTaskLog ? parent : undefined,
+                parent,
                 state: 'succeeded',
                 taskID,
                 taskSlug

package/dist/queues/operations/runJobs/runJob/getRunTaskFunction.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"sources":["../../../../../src/queues/operations/runJobs/runJob/getRunTaskFunction.ts"],"sourcesContent":["import ObjectIdImport from 'bson-objectid'\n\nimport type { Job } from '../../../../index.js'\nimport type { JsonObject, PayloadRequest } from '../../../../types/index.js'\nimport type {\n RetryConfig,\n RunInlineTaskFunction,\n RunTaskFunction,\n RunTaskFunctions,\n TaskConfig,\n TaskHandler,\n TaskHandlerResult,\n TaskType,\n} from '../../../config/types/taskTypes.js'\nimport type {\n JobLog,\n SingleTaskStatus,\n WorkflowConfig,\n WorkflowTypes,\n} from '../../../config/types/workflowTypes.js'\nimport type { UpdateJobFunction } from './getUpdateJobFunction.js'\n\nimport { JobCancelledError, TaskError } from '../../../errors/index.js'\nimport { getCurrentDate } from '../../../utilities/getCurrentDate.js'\nimport { getTaskHandlerFromConfig } from './importHandlerPath.js'\n\nconst ObjectId = 'default' in ObjectIdImport ? ObjectIdImport.default : ObjectIdImport\n\nexport type TaskParent = {\n taskID: string\n taskSlug: string\n}\n\nexport const getRunTaskFunction = <TIsInline extends boolean>(\n job: Job,\n workflowConfig: WorkflowConfig,\n req: PayloadRequest,\n isInline: TIsInline,\n updateJob: UpdateJobFunction,\n parent?: TaskParent,\n): TIsInline extends true ? RunInlineTaskFunction : RunTaskFunctions => {\n const jobConfig = req.payload.config.jobs\n\n const runTask: <TTaskSlug extends string>(\n taskSlug: TTaskSlug,\n ) => TTaskSlug extends 'inline' ? RunInlineTaskFunction : RunTaskFunction<TTaskSlug> = (\n taskSlug,\n ) =>\n (async (\n taskID: Parameters<RunInlineTaskFunction>[0],\n {\n input,\n retries,\n // Only available for inline tasks:\n task,\n }: Parameters<RunInlineTaskFunction>[1] & Parameters<RunTaskFunction<string>>[1],\n ) => {\n const executedAt = getCurrentDate()\n\n let taskConfig: TaskConfig \| undefined\n if (!isInline) {\n taskConfig = (jobConfig.tasks?.length &&\n jobConfig.tasks.find((t) => t.slug === taskSlug)) as TaskConfig<string>\n\n if (!taskConfig) {\n throw new Error(`Task ${taskSlug} not found in workflow ${job.workflowSlug}`)\n }\n }\n\n const retriesConfigFromPropsNormalized =\n retries == undefined \|\| retries == null\n ? {}\n : typeof retries === 'number'\n ? { attempts: retries }\n : retries\n const retriesConfigFromTaskConfigNormalized = taskConfig\n ? typeof taskConfig.retries === 'number'\n ? { attempts: taskConfig.retries }\n : taskConfig.retries\n : {}\n\n const finalRetriesConfig: RetryConfig = {\n ...retriesConfigFromTaskConfigNormalized,\n ...retriesConfigFromPropsNormalized, // Retry config from props takes precedence\n }\n\n const taskStatus: null \| SingleTaskStatus<string> = job?.taskStatus?.[taskSlug]\n ? job.taskStatus[taskSlug][taskID]!\n : null\n\n // Handle restoration of task if it succeeded in a previous run\n if (taskStatus && taskStatus.complete === true) {\n let shouldRestore = true\n if (finalRetriesConfig?.shouldRestore === false) {\n shouldRestore = false\n } else if (typeof finalRetriesConfig?.shouldRestore === 'function') {\n shouldRestore = await finalRetriesConfig.shouldRestore({\n input,\n job,\n req,\n taskStatus,\n })\n }\n if (shouldRestore) {\n return taskStatus.output\n }\n }\n\n const runner = isInline\n ? (task as TaskHandler<TaskType>)\n : await getTaskHandlerFromConfig(taskConfig)\n\n if (!runner \|\| typeof runner !== 'function') {\n throw new TaskError({\n executedAt,\n input,\n job,\n message: isInline\n ? `Inline task with ID ${taskID} does not have a valid handler.`\n : `Task with slug ${taskSlug} in workflow ${job.workflowSlug} does not have a valid handler.`,\n parent,\n retriesConfig: finalRetriesConfig,\n taskConfig,\n taskID,\n taskSlug,\n taskStatus,\n workflowConfig,\n })\n }\n\n let taskHandlerResult: TaskHandlerResult<string>\n let output: JsonObject \| undefined = {}\n\n try {\n taskHandlerResult = await runner({\n inlineTask: getRunTaskFunction(job, workflowConfig, req, true, updateJob, {\n taskID,\n taskSlug,\n }),\n input,\n job: job as unknown as Job<WorkflowTypes>,\n req,\n tasks: getRunTaskFunction(job, workflowConfig, req, false, updateJob, {\n taskID,\n taskSlug,\n }),\n })\n } catch (err: any) {\n if (err instanceof JobCancelledError) {\n // Re-throw JobCancelledError to be handled by the top-level error handler\n throw err\n }\n throw new TaskError({\n executedAt,\n input: input!,\n job,\n message: err.message \|\| 'Task handler threw an error',\n output,\n parent,\n retriesConfig: finalRetriesConfig,\n taskConfig,\n taskID,\n taskSlug,\n taskStatus,\n workflowConfig,\n })\n }\n\n if (taskHandlerResult.state === 'failed') {\n throw new TaskError({\n executedAt,\n input: input!,\n job,\n message: taskHandlerResult.errorMessage ?? 'Task handler returned a failed state',\n output,\n parent,\n retriesConfig: finalRetriesConfig,\n taskConfig,\n taskID,\n taskSlug,\n taskStatus,\n workflowConfig,\n })\n } else {\n output = taskHandlerResult.output\n }\n\n if (taskConfig?.onSuccess) {\n await taskConfig.onSuccess({\n input,\n job,\n req,\n taskStatus,\n })\n }\n\n const newLogItem: JobLog = {\n id: new ObjectId().toHexString(),\n completedAt: getCurrentDate().toISOString(),\n executedAt: executedAt.toISOString(),\n input,\n output,\n parent: jobConfig.addParentToTaskLog ? parent : undefined,\n state: 'succeeded',\n taskID,\n taskSlug,\n }\n\n await updateJob({\n log: {\n $push: newLogItem,\n } as any,\n // Set to null to skip main row update on postgres. 2 => 1 db round trips\n updatedAt: null as any,\n })\n\n return output\n }) as any\n\n if (isInline) {\n return runTask('inline') as TIsInline extends true ? RunInlineTaskFunction : RunTaskFunctions\n } else {\n const tasks: RunTaskFunctions = {}\n for (const task of jobConfig.tasks ?? []) {\n tasks[task.slug] = runTask(task.slug) as RunTaskFunction<string>\n }\n return tasks as TIsInline extends true ? RunInlineTaskFunction : RunTaskFunctions\n }\n}\n"],"names":["ObjectIdImport","JobCancelledError","TaskError","getCurrentDate","getTaskHandlerFromConfig","ObjectId","default","getRunTaskFunction","job","workflowConfig","req","isInline","updateJob","parent","jobConfig","payload","config","jobs","runTask","taskSlug","taskID","input","retries","task","executedAt","taskConfig","tasks","length","find","t","slug","Error","workflowSlug","retriesConfigFromPropsNormalized","undefined","attempts","retriesConfigFromTaskConfigNormalized","finalRetriesConfig","taskStatus","complete","shouldRestore","output","runner","message","retriesConfig","taskHandlerResult","inlineTask","err","state","errorMessage","onSuccess","newLogItem","id","toHexString","completedAt","toISOString","addParentToTaskLog","log","$push","updatedAt"],"mappings":"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"}
1	+ {"version":3,"sources":["../../../../../src/queues/operations/runJobs/runJob/getRunTaskFunction.ts"],"sourcesContent":["import ObjectIdImport from 'bson-objectid'\n\nimport type { Job } from '../../../../index.js'\nimport type { PayloadRequest } from '../../../../types/index.js'\nimport type {\n RetryConfig,\n RunInlineTaskFunction,\n RunTaskFunction,\n RunTaskFunctions,\n TaskConfig,\n TaskHandler,\n TaskHandlerResult,\n TaskSlug,\n} from '../../../config/types/taskTypes.js'\nimport type {\n JobLog,\n SingleTaskStatus,\n WorkflowConfig,\n WorkflowSlug,\n} from '../../../config/types/workflowTypes.js'\nimport type { UpdateJobFunction } from './getUpdateJobFunction.js'\n\nimport { JobCancelledError, JobRunAbortedError, TaskError } from '../../../errors/index.js'\nimport { getCurrentDate } from '../../../utilities/getCurrentDate.js'\nimport { getTaskHandlerFromConfig } from './importHandlerPath.js'\n\nconst ObjectId = 'default' in ObjectIdImport ? ObjectIdImport.default : ObjectIdImport\n\nexport type TaskParent = {\n taskID: string\n taskSlug: string\n}\n\nexport const getRunTaskFunction = <TIsInline extends boolean>(\n job: Job,\n workflowConfig: WorkflowConfig,\n req: PayloadRequest,\n isInline: TIsInline,\n updateJob: UpdateJobFunction,\n parent?: TaskParent,\n): TIsInline extends true ? RunInlineTaskFunction : RunTaskFunctions => {\n const jobConfig = req.payload.config.jobs\n\n const runTask: <TTaskSlug extends string>(\n taskSlug: TTaskSlug,\n ) => TTaskSlug extends 'inline' ? RunInlineTaskFunction : RunTaskFunction<TTaskSlug> = (\n taskSlug,\n ) =>\n (async (\n taskID: Parameters<RunInlineTaskFunction>[0],\n {\n input,\n retries,\n // Only available for inline tasks:\n task,\n }: Parameters<RunInlineTaskFunction>[1] & Parameters<RunTaskFunction<string>>[1],\n ) => {\n const executedAt = getCurrentDate()\n\n let taskConfig: TaskConfig \| undefined\n if (!isInline) {\n taskConfig = (jobConfig.tasks?.length &&\n jobConfig.tasks.find((t) => t.slug === taskSlug)) as TaskConfig<string>\n\n if (!taskConfig) {\n throw new Error(`Task ${taskSlug} not found in workflow ${job.workflowSlug}`)\n }\n }\n\n const retriesConfigFromPropsNormalized =\n retries == undefined \|\| retries == null\n ? {}\n : typeof retries === 'number'\n ? { attempts: retries }\n : retries\n const retriesConfigFromTaskConfigNormalized = taskConfig\n ? typeof taskConfig.retries === 'number'\n ? { attempts: taskConfig.retries }\n : taskConfig.retries\n : {}\n\n const finalRetriesConfig: RetryConfig = {\n ...retriesConfigFromTaskConfigNormalized,\n ...retriesConfigFromPropsNormalized, // Retry config from props takes precedence\n }\n\n const taskStatus: null \| SingleTaskStatus<string> = job?.taskStatus?.[taskSlug]\n ? job.taskStatus[taskSlug][taskID]!\n : null\n\n // Handle restoration of task if it succeeded in a previous run\n if (taskStatus && taskStatus.complete === true) {\n let shouldRestore = true\n if (finalRetriesConfig?.shouldRestore === false) {\n shouldRestore = false\n } else if (typeof finalRetriesConfig?.shouldRestore === 'function') {\n shouldRestore = await finalRetriesConfig.shouldRestore({\n input,\n job,\n req,\n taskStatus,\n })\n }\n if (shouldRestore) {\n return taskStatus.output\n }\n }\n\n const runner = isInline\n ? (task as TaskHandler<TaskSlug>)\n : await getTaskHandlerFromConfig(taskConfig)\n\n if (!runner \|\| typeof runner !== 'function') {\n throw new TaskError({\n executedAt,\n input,\n job,\n message: isInline\n ? `Inline task with ID ${taskID} does not have a valid handler.`\n : `Task with slug ${taskSlug} in workflow ${job.workflowSlug} does not have a valid handler.`,\n parent,\n retriesConfig: finalRetriesConfig,\n taskConfig,\n taskID,\n taskSlug,\n taskStatus,\n workflowConfig,\n })\n }\n\n let output: TaskHandlerResult<string>['output']\n\n try {\n output = (\n await runner({\n inlineTask: getRunTaskFunction(job, workflowConfig, req, true, updateJob, {\n taskID,\n taskSlug,\n }),\n input,\n job: job as unknown as Job<WorkflowSlug>,\n req,\n tasks: getRunTaskFunction(job, workflowConfig, req, false, updateJob, {\n taskID,\n taskSlug,\n }),\n })\n )?.output\n } catch (err: any) {\n if (err instanceof JobCancelledError \|\| err instanceof JobRunAbortedError) {\n // Job run aborts are handled by the top-level runner.\n throw err\n }\n throw new TaskError({\n executedAt,\n input: input!,\n job,\n message: err.message \|\| 'Task handler threw an error',\n output,\n parent,\n retriesConfig: finalRetriesConfig,\n taskConfig,\n taskID,\n taskSlug,\n taskStatus,\n workflowConfig,\n })\n }\n\n if (taskConfig?.onSuccess) {\n await taskConfig.onSuccess({\n input,\n job,\n req,\n taskStatus,\n })\n }\n\n const newLogItem: JobLog = {\n id: new ObjectId().toHexString(),\n completedAt: getCurrentDate().toISOString(),\n executedAt: executedAt.toISOString(),\n input: input ?? {},\n output,\n parent,\n state: 'succeeded',\n taskID,\n taskSlug,\n }\n\n await updateJob({\n log: {\n $push: newLogItem,\n } as any,\n // Set to null to skip main row update on postgres. 2 => 1 db round trips\n updatedAt: null as any,\n })\n\n return output\n }) as any\n\n if (isInline) {\n return runTask('inline') as TIsInline extends true ? RunInlineTaskFunction : RunTaskFunctions\n } else {\n const tasks: RunTaskFunctions = {}\n for (const task of jobConfig.tasks ?? []) {\n tasks[task.slug] = runTask(task.slug) as RunTaskFunction<string>\n }\n return tasks as TIsInline extends true ? RunInlineTaskFunction : RunTaskFunctions\n }\n}\n"],"names":["ObjectIdImport","JobCancelledError","JobRunAbortedError","TaskError","getCurrentDate","getTaskHandlerFromConfig","ObjectId","default","getRunTaskFunction","job","workflowConfig","req","isInline","updateJob","parent","jobConfig","payload","config","jobs","runTask","taskSlug","taskID","input","retries","task","executedAt","taskConfig","tasks","length","find","t","slug","Error","workflowSlug","retriesConfigFromPropsNormalized","undefined","attempts","retriesConfigFromTaskConfigNormalized","finalRetriesConfig","taskStatus","complete","shouldRestore","output","runner","message","retriesConfig","inlineTask","err","onSuccess","newLogItem","id","toHexString","completedAt","toISOString","state","log","$push","updatedAt"],"mappings":"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"}

package/dist/queues/operations/runJobs/runJob/getUpdateJobFunction.d.ts CHANGED Viewed

@@ -4,7 +4,8 @@ export type UpdateJobFunction = (jobData: Partial<Job>) => Promise<Job>;
 /**
  * Helper for updating a job that does the following, additionally to updating the job:
  * - Merges incoming data from the updated job into the original job object
- * - Handles job cancellation by throwing a `JobCancelledError` if the job was cancelled.
+ * - Throws a `JobCancelledError` if another process cancelled the job.
+ * - Stops updates after this worker loses the job's lease.
  */
 export declare function getUpdateJobFunction(job: Job, req: PayloadRequest): UpdateJobFunction;
 //# sourceMappingURL=getUpdateJobFunction.d.ts.map

package/dist/queues/operations/runJobs/runJob/getUpdateJobFunction.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"getUpdateJobFunction.d.ts","sourceRoot":"","sources":["../../../../../src/queues/operations/runJobs/runJob/getUpdateJobFunction.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,sBAAsB,CAAA;AAC/C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAA;~~AAKhE~~,MAAM,MAAM,iBAAiB,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,KAAK,OAAO,CAAC,GAAG,CAAC,CAAA;AAEvE~~;;;;GAIG~~;AACH,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,cAAc,GAAG,iBAAiB,~~CAmCrF~~"}
1	+ {"version":3,"file":"getUpdateJobFunction.d.ts","sourceRoot":"","sources":["../../../../../src/queues/operations/runJobs/runJob/getUpdateJobFunction.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,sBAAsB,CAAA;AAC/C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAA;AAMhE,MAAM,MAAM,iBAAiB,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,KAAK,OAAO,CAAC,GAAG,CAAC,CAAA;AAEvE;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,cAAc,GAAG,iBAAiB,CAyDrF"}

package/dist/queues/operations/runJobs/runJob/getUpdateJobFunction.js CHANGED Viewed

@@ -1,20 +1,49 @@
-import { JobCancelledError } from '../../../errors/index.js';
-import { updateJob } from '../../../utilities/updateJob.js';
+import { JobCancelledError, JobRunAbortedError } from '../../../errors/index.js';
+import { getCurrentDate } from '../../../utilities/getCurrentDate.js';
+import { updateJobs } from '../../../utilities/updateJob.js';
 /**
  * Helper for updating a job that does the following, additionally to updating the job:
  * - Merges incoming data from the updated job into the original job object
- * - Handles job cancellation by throwing a `JobCancelledError` if the job was cancelled.
+ * - Throws a `JobCancelledError` if another process cancelled the job.
+ * - Stops updates after this worker loses the job's lease.
  */ export function getUpdateJobFunction(job, req) {
     return async (jobData)=>{
-        const updatedJob = await updateJob({
-            id: job.id,
+        const processingToken = job.processingToken;
+        if (!processingToken) {
+            throw new JobRunAbortedError(`Job ${job.id} can no longer be updated by this runner`);
+        }
+        const minimumProcessingUntil = new Date(getCurrentDate().getTime() + req.payload.config.jobs.processingLease.safetyBuffer).toISOString();
+        const updatedJobs = await updateJobs({
             data: jobData,
-            depth: req.payload.config.jobs.depth,
-            disableTransaction: true,
-            req
+            limit: 1,
+            req,
+            returning: true,
+            where: {
+                and: [
+                    {
+                        id: {
+                            equals: job.id
+                        }
+                    },
+                    {
+                        processingToken: {
+                            equals: processingToken
+                        }
+                    },
+                    // Do not update this job if the lease expired.
+                    // Append safety buffer, as, depending on the db adapter, the update itself
+                    // may not be atomic, and another worker may have claimed the job before this update finishes.
+                    {
+                        processingUntil: {
+                            greater_than: minimumProcessingUntil
+                        }
+                    }
+                ]
+            }
         });
+        const updatedJob = updatedJobs?.[0];
         if (!updatedJob) {
-            return job;
+            throw new JobRunAbortedError(`Job ${job.id} can no longer be updated by this runner`);
         }
         // Update job object like this to modify the original object - that way, incoming changes (e.g. taskStatus field that will be re-generated through the hook) will be reflected in the calling function
         for(const key in updatedJob){
@@ -32,7 +61,7 @@ import { updateJob } from '../../../utilities/updateJob.js';
                 job[key] = updatedJob[key];
             }
         }
-        if (updatedJob?.error?.cancelled) {
+        if (updatedJob.error?.cancelled && !jobData.error?.cancelled) {
             throw new JobCancelledError(`Job ${job.id} was cancelled`);
         }
         return updatedJob;

package/dist/queues/operations/runJobs/runJob/getUpdateJobFunction.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"sources":["../../../../../src/queues/operations/runJobs/runJob/getUpdateJobFunction.ts"],"sourcesContent":["import type { Job } from '../../../../index.js'\nimport type { PayloadRequest } from '../../../../types/index.js'\n\nimport { JobCancelledError } from '../../../errors/index.js'\nimport { ~~updateJob~~ } from '../../../utilities/updateJob.js'\n\nexport type UpdateJobFunction = (jobData: Partial<Job>) => Promise<Job>\n\n/*\n Helper for updating a job that does the following, additionally to updating the job:\n * - Merges incoming data from the updated job into the original job object\n * - ~~Handles~~ ~~job cancellation by throwing~~ a `JobCancelledError` if the job ~~was~~ ~~cancelled~~.\n */\nexport function getUpdateJobFunction(job: Job, req: PayloadRequest): UpdateJobFunction {\n return async (jobData) => {\n const ~~updatedJob~~ = ~~await~~ ~~updateJob~~({\n ~~id:~~ job.id,\n ~~data:~~ ~~jobData,\~~n ~~depth:~~ req.payload.config.jobs.~~depth~~,\n ~~disableTransaction~~: ~~true~~,\n req,\n })\n\n if (!updatedJob) {\n ~~return~~ job\n }\n\n // Update job object like this to modify the original object - that way, incoming changes (e.g. taskStatus field that will be re-generated through the hook) will be reflected in the calling function\n for (const key in updatedJob) {\n if (key === 'log') {\n // Add all new log entries to the original job.log object. Do not delete any existing log entries.\n // Do not update existing log entries, as existing log entries should be immutable.\n for (const logEntry of updatedJob?.log ?? []) {\n if (!job.log \|\| !job.log.some((entry) => entry.id === logEntry.id)) {\n ;(job.log ??= []).push(logEntry)\n }\n }\n } else {\n ;(job as any)[key] = updatedJob[key as keyof Job]\n }\n }\n\n if ((updatedJob?.error as Record<string, unknown>)?.cancelled) {\n throw new JobCancelledError(`Job ${job.id} was cancelled`)\n }\n\n return updatedJob\n }\n}\n"],"names":["JobCancelledError","~~updateJob~~","getUpdateJobFunction","job","req","jobData","~~updatedJob~~","id","~~data~~","~~depth~~","payload","config","jobs","~~disableTransaction~~","key","logEntry","log","some","entry","push","error","cancelled"],"mappings":"AAGA,SAASA,iBAAiB,QAAQ,2BAA0B;~~AAC5D~~,SAASC,~~SAAS~~,QAAQ,kCAAiC;~~AAI3D;;;;CAIC~~,GACD,OAAO,SAASC,qBAAqBC,GAAQ,EAAEC,GAAmB;IAChE,OAAO,OAAOC;QACZ,MAAMC,~~aAAa~~,~~MAAML~~,~~UAAU~~;~~YACjCM~~,~~IAAIJ~~,IAAII,EAAE~~;YACVC~~,~~MAAMH~~;~~YACNI~~,~~OAAOL~~,~~IAAIM~~,OAAO,CAACC,MAAM,CAACC,IAAI,~~CAACH~~,KAAK;~~YACpCI~~,~~oBAAoB~~;~~YACpBT~~;QACF;~~QAEA~~,IAAI,~~CAACE~~,YAAY;YACf,~~OAAOH~~;~~QACT~~;QAEA,sMAAsM;QACtM,IAAK,~~MAAMW~~,~~OAAOR~~,WAAY;YAC5B,~~IAAIQ~~,QAAQ,OAAO;gBACjB,kGAAkG;gBAClG,mFAAmF;gBACnF,KAAK,MAAMC,~~YAAYT~~,~~YAAYU~~,OAAO,EAAE,CAAE;oBAC5C,IAAI,~~CAACb~~,~~IAAIa~~,GAAG,IAAI,~~CAACb~~,~~IAAIa~~,GAAG,CAACC,IAAI,CAAC,CAACC,QAAUA,~~MAAMX~~,EAAE,~~KAAKQ~~,~~SAASR~~,EAAE,GAAG;;wBAChEJ,CAAAA,~~IAAIa~~,GAAG,KAAK,EAAE,AAAD,EAAGG,IAAI,CAACJ;oBACzB;gBACF;YACF,OAAO;;~~gBACHZ~~,GAAW,~~CAACW~~,IAAI,~~GAAGR~~,UAAU,~~CAACQ~~,IAAiB;YACnD;QACF;QAEA,~~IAAKR~~,~~YAAYc~~,~~OAAmCC~~,~~WAAW~~;~~YAC7D~~,MAAM,~~IAAIrB~~,kBAAkB,CAAC,IAAI,~~EAAEG~~,IAAII,EAAE,CAAC,cAAc,CAAC;QAC3D;QAEA,~~OAAOD~~;IACT;AACF"}
1	+ {"version":3,"sources":["../../../../../src/queues/operations/runJobs/runJob/getUpdateJobFunction.ts"],"sourcesContent":["import type { Job } from '../../../../index.js'\nimport type { PayloadRequest } from '../../../../types/index.js'\n\nimport { JobCancelledError, JobRunAbortedError } from '../../../errors/index.js'\nimport { getCurrentDate } from '../../../utilities/getCurrentDate.js'\nimport { updateJobs } from '../../../utilities/updateJob.js'\n\nexport type UpdateJobFunction = (jobData: Partial<Job>) => Promise<Job>\n\n/*\n Helper for updating a job that does the following, additionally to updating the job:\n * - Merges incoming data from the updated job into the original job object\n * - Throws a `JobCancelledError` if another process cancelled the job.\n * - Stops updates after this worker loses the job's lease.\n */\nexport function getUpdateJobFunction(job: Job, req: PayloadRequest): UpdateJobFunction {\n return async (jobData) => {\n const processingToken = job.processingToken\n\n if (!processingToken) {\n throw new JobRunAbortedError(`Job ${job.id} can no longer be updated by this runner`)\n }\n\n const minimumProcessingUntil = new Date(\n getCurrentDate().getTime() + req.payload.config.jobs.processingLease.safetyBuffer,\n ).toISOString()\n const updatedJobs = await updateJobs({\n data: jobData,\n limit: 1,\n req,\n returning: true,\n where: {\n and: [\n { id: { equals: job.id } },\n { processingToken: { equals: processingToken } },\n // Do not update this job if the lease expired.\n // Append safety buffer, as, depending on the db adapter, the update itself\n // may not be atomic, and another worker may have claimed the job before this update finishes.\n { processingUntil: { greater_than: minimumProcessingUntil } },\n ],\n },\n })\n const updatedJob = updatedJobs?.[0]\n\n if (!updatedJob) {\n throw new JobRunAbortedError(`Job ${job.id} can no longer be updated by this runner`)\n }\n\n // Update job object like this to modify the original object - that way, incoming changes (e.g. taskStatus field that will be re-generated through the hook) will be reflected in the calling function\n for (const key in updatedJob) {\n if (key === 'log') {\n // Add all new log entries to the original job.log object. Do not delete any existing log entries.\n // Do not update existing log entries, as existing log entries should be immutable.\n for (const logEntry of updatedJob?.log ?? []) {\n if (!job.log \|\| !job.log.some((entry) => entry.id === logEntry.id)) {\n ;(job.log ??= []).push(logEntry)\n }\n }\n } else {\n ;(job as any)[key] = updatedJob[key as keyof Job]\n }\n }\n\n if (\n (updatedJob.error as Record<string, unknown>)?.cancelled &&\n !(jobData.error as Record<string, unknown> \| undefined)?.cancelled\n ) {\n throw new JobCancelledError(`Job ${job.id} was cancelled`)\n }\n\n return updatedJob\n }\n}\n"],"names":["JobCancelledError","JobRunAbortedError","getCurrentDate","updateJobs","getUpdateJobFunction","job","req","jobData","processingToken","id","minimumProcessingUntil","Date","getTime","payload","config","jobs","processingLease","safetyBuffer","toISOString","updatedJobs","data","limit","returning","where","and","equals","processingUntil","greater_than","updatedJob","key","logEntry","log","some","entry","push","error","cancelled"],"mappings":"AAGA,SAASA,iBAAiB,EAAEC,kBAAkB,QAAQ,2BAA0B;AAChF,SAASC,cAAc,QAAQ,uCAAsC;AACrE,SAASC,UAAU,QAAQ,kCAAiC;AAI5D;;;;;CAKC,GACD,OAAO,SAASC,qBAAqBC,GAAQ,EAAEC,GAAmB;IAChE,OAAO,OAAOC;QACZ,MAAMC,kBAAkBH,IAAIG,eAAe;QAE3C,IAAI,CAACA,iBAAiB;YACpB,MAAM,IAAIP,mBAAmB,CAAC,IAAI,EAAEI,IAAII,EAAE,CAAC,wCAAwC,CAAC;QACtF;QAEA,MAAMC,yBAAyB,IAAIC,KACjCT,iBAAiBU,OAAO,KAAKN,IAAIO,OAAO,CAACC,MAAM,CAACC,IAAI,CAACC,eAAe,CAACC,YAAY,EACjFC,WAAW;QACb,MAAMC,cAAc,MAAMhB,WAAW;YACnCiB,MAAMb;YACNc,OAAO;YACPf;YACAgB,WAAW;YACXC,OAAO;gBACLC,KAAK;oBACH;wBAAEf,IAAI;4BAAEgB,QAAQpB,IAAII,EAAE;wBAAC;oBAAE;oBACzB;wBAAED,iBAAiB;4BAAEiB,QAAQjB;wBAAgB;oBAAE;oBAC/C,+CAA+C;oBAC/C,2EAA2E;oBAC3E,8FAA8F;oBAC9F;wBAAEkB,iBAAiB;4BAAEC,cAAcjB;wBAAuB;oBAAE;iBAC7D;YACH;QACF;QACA,MAAMkB,aAAaT,aAAa,CAAC,EAAE;QAEnC,IAAI,CAACS,YAAY;YACf,MAAM,IAAI3B,mBAAmB,CAAC,IAAI,EAAEI,IAAII,EAAE,CAAC,wCAAwC,CAAC;QACtF;QAEA,sMAAsM;QACtM,IAAK,MAAMoB,OAAOD,WAAY;YAC5B,IAAIC,QAAQ,OAAO;gBACjB,kGAAkG;gBAClG,mFAAmF;gBACnF,KAAK,MAAMC,YAAYF,YAAYG,OAAO,EAAE,CAAE;oBAC5C,IAAI,CAAC1B,IAAI0B,GAAG,IAAI,CAAC1B,IAAI0B,GAAG,CAACC,IAAI,CAAC,CAACC,QAAUA,MAAMxB,EAAE,KAAKqB,SAASrB,EAAE,GAAG;;wBAChEJ,CAAAA,IAAI0B,GAAG,KAAK,EAAE,AAAD,EAAGG,IAAI,CAACJ;oBACzB;gBACF;YACF,OAAO;;gBACHzB,GAAW,CAACwB,IAAI,GAAGD,UAAU,CAACC,IAAiB;YACnD;QACF;QAEA,IACE,AAACD,WAAWO,KAAK,EAA8BC,aAC/C,CAAE7B,QAAQ4B,KAAK,EAA0CC,WACzD;YACA,MAAM,IAAIpC,kBAAkB,CAAC,IAAI,EAAEK,IAAII,EAAE,CAAC,cAAc,CAAC;QAC3D;QAEA,OAAOmB;IACT;AACF"}

package/dist/queues/operations/runJobs/runJob/importHandlerPath.d.ts CHANGED Viewed

@@ -8,5 +8,5 @@ export declare function importHandlerPath<T>(path: string): Promise<T>;
  * This function resolves the handler to a function, either by importing it from the path or returning the function directly
  * if it is already a function.
  */
-export declare function getTaskHandlerFromConfig(taskConfig?: TaskConfig): Promise<TaskHandler<string, string>>;
+export declare function getTaskHandlerFromConfig(taskConfig?: TaskConfig): Promise<TaskHandler<string>>;
 //# sourceMappingURL=importHandlerPath.d.ts.map

package/dist/queues/operations/runJobs/runJob/importHandlerPath.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"importHandlerPath.d.ts","sourceRoot":"","sources":["../../../../../src/queues/operations/runJobs/runJob/importHandlerPath.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,WAAW,EAAY,MAAM,oCAAoC,CAAA;AAI3F;;GAEG;AACH,wBAAsB,iBAAiB,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,CA6BnE;AAED;;;;GAIG;AACH,wBAAsB,wBAAwB,CAAC,UAAU,CAAC,EAAE,UAAU,~~wCASrE~~"}
1	+ {"version":3,"file":"importHandlerPath.d.ts","sourceRoot":"","sources":["../../../../../src/queues/operations/runJobs/runJob/importHandlerPath.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,WAAW,EAAY,MAAM,oCAAoC,CAAA;AAI3F;;GAEG;AACH,wBAAsB,iBAAiB,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,CA6BnE;AAED;;;;GAIG;AACH,wBAAsB,wBAAwB,CAAC,UAAU,CAAC,EAAE,UAAU,gCASrE"}

package/dist/queues/operations/runJobs/runJob/importHandlerPath.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"sources":["../../../../../src/queues/operations/runJobs/runJob/importHandlerPath.ts"],"sourcesContent":["import type { TaskConfig, TaskHandler, ~~TaskType~~ } from '../../../config/types/taskTypes.js'\n\nimport { dynamicImport } from '../../../../utilities/dynamicImport.js'\n\n/*\n Imports a handler function from a given path.\n /\nexport async function importHandlerPath<T>(path: string): Promise<T> {\n let runner!: T\n const [runnerPath, runnerImportName] = path.split('#')\n\n let runnerModule: Record<string, unknown>\n try {\n runnerModule = await dynamicImport<Record<string, unknown>>(runnerPath!)\n } catch (e) {\n throw new Error(\n `Error importing job queue handler module for path ${path}. This is an advanced feature that may require a sophisticated build pipeline, especially when using it in production or within Next.js, e.g. by calling opening the /api/payload-jobs/run endpoint. You will have to transpile the handler files separately and ensure they are available in the same location when the job is run. If you're using an endpoint to execute your jobs, it's recommended to define your handlers as functions directly in your Payload Config, or use import paths handlers outside of Next.js. Import Error: \\n${e instanceof Error ? e.message : 'Unknown error'}`,\n )\n }\n\n // If the path has indicated an #exportName, try to get it\n if (runnerImportName && runnerModule[runnerImportName]) {\n runner = runnerModule[runnerImportName] as T\n }\n\n // If there is a default export, use it\n if (!runner && runnerModule.default) {\n runner = runnerModule.default as T\n }\n\n // Finally, use whatever was imported\n if (!runner) {\n runner = runnerModule as T\n }\n\n return runner\n}\n\n/\n The `handler` property of a task config can either be a function or a path to a module that exports a function.\n * This function resolves the handler to a function, either by importing it from the path or returning the function directly\n * if it is already a function.\n */\nexport async function getTaskHandlerFromConfig(taskConfig?: TaskConfig) {\n if (!taskConfig) {\n throw new Error('Task config is required to get the task handler')\n }\n if (typeof taskConfig.handler === 'function') {\n return taskConfig.handler\n } else {\n return await importHandlerPath<TaskHandler<~~TaskType~~>>(taskConfig.handler)\n }\n}\n"],"names":["dynamicImport","importHandlerPath","path","runner","runnerPath","runnerImportName","split","runnerModule","e","Error","message","default","getTaskHandlerFromConfig","taskConfig","handler"],"mappings":"AAEA,SAASA,aAAa,QAAQ,yCAAwC;AAEtE;;CAEC,GACD,OAAO,eAAeC,kBAAqBC,IAAY;IACrD,IAAIC;IACJ,MAAM,CAACC,YAAYC,iBAAiB,GAAGH,KAAKI,KAAK,CAAC;IAElD,IAAIC;IACJ,IAAI;QACFA,eAAe,MAAMP,cAAuCI;IAC9D,EAAE,OAAOI,GAAG;QACV,MAAM,IAAIC,MACR,CAAC,kDAAkD,EAAEP,KAAK,+gBAA+gB,EAAEM,aAAaC,QAAQD,EAAEE,OAAO,GAAG,iBAAiB;IAEjoB;IAEA,0DAA0D;IAC1D,IAAIL,oBAAoBE,YAAY,CAACF,iBAAiB,EAAE;QACtDF,SAASI,YAAY,CAACF,iBAAiB;IACzC;IAEA,uCAAuC;IACvC,IAAI,CAACF,UAAUI,aAAaI,OAAO,EAAE;QACnCR,SAASI,aAAaI,OAAO;IAC/B;IAEA,qCAAqC;IACrC,IAAI,CAACR,QAAQ;QACXA,SAASI;IACX;IAEA,OAAOJ;AACT;AAEA;;;;CAIC,GACD,OAAO,eAAeS,yBAAyBC,UAAuB;IACpE,IAAI,CAACA,YAAY;QACf,MAAM,IAAIJ,MAAM;IAClB;IACA,IAAI,OAAOI,WAAWC,OAAO,KAAK,YAAY;QAC5C,OAAOD,WAAWC,OAAO;IAC3B,OAAO;QACL,OAAO,MAAMb,kBAAyCY,WAAWC,OAAO;IAC1E;AACF"}
1	+ {"version":3,"sources":["../../../../../src/queues/operations/runJobs/runJob/importHandlerPath.ts"],"sourcesContent":["import type { TaskConfig, TaskHandler, TaskSlug } from '../../../config/types/taskTypes.js'\n\nimport { dynamicImport } from '../../../../utilities/dynamicImport.js'\n\n/*\n Imports a handler function from a given path.\n /\nexport async function importHandlerPath<T>(path: string): Promise<T> {\n let runner!: T\n const [runnerPath, runnerImportName] = path.split('#')\n\n let runnerModule: Record<string, unknown>\n try {\n runnerModule = await dynamicImport<Record<string, unknown>>(runnerPath!)\n } catch (e) {\n throw new Error(\n `Error importing job queue handler module for path ${path}. This is an advanced feature that may require a sophisticated build pipeline, especially when using it in production or within Next.js, e.g. by calling opening the /api/payload-jobs/run endpoint. You will have to transpile the handler files separately and ensure they are available in the same location when the job is run. If you're using an endpoint to execute your jobs, it's recommended to define your handlers as functions directly in your Payload Config, or use import paths handlers outside of Next.js. Import Error: \\n${e instanceof Error ? e.message : 'Unknown error'}`,\n )\n }\n\n // If the path has indicated an #exportName, try to get it\n if (runnerImportName && runnerModule[runnerImportName]) {\n runner = runnerModule[runnerImportName] as T\n }\n\n // If there is a default export, use it\n if (!runner && runnerModule.default) {\n runner = runnerModule.default as T\n }\n\n // Finally, use whatever was imported\n if (!runner) {\n runner = runnerModule as T\n }\n\n return runner\n}\n\n/\n The `handler` property of a task config can either be a function or a path to a module that exports a function.\n * This function resolves the handler to a function, either by importing it from the path or returning the function directly\n * if it is already a function.\n */\nexport async function getTaskHandlerFromConfig(taskConfig?: TaskConfig) {\n if (!taskConfig) {\n throw new Error('Task config is required to get the task handler')\n }\n if (typeof taskConfig.handler === 'function') {\n return taskConfig.handler\n } else {\n return await importHandlerPath<TaskHandler<TaskSlug>>(taskConfig.handler)\n }\n}\n"],"names":["dynamicImport","importHandlerPath","path","runner","runnerPath","runnerImportName","split","runnerModule","e","Error","message","default","getTaskHandlerFromConfig","taskConfig","handler"],"mappings":"AAEA,SAASA,aAAa,QAAQ,yCAAwC;AAEtE;;CAEC,GACD,OAAO,eAAeC,kBAAqBC,IAAY;IACrD,IAAIC;IACJ,MAAM,CAACC,YAAYC,iBAAiB,GAAGH,KAAKI,KAAK,CAAC;IAElD,IAAIC;IACJ,IAAI;QACFA,eAAe,MAAMP,cAAuCI;IAC9D,EAAE,OAAOI,GAAG;QACV,MAAM,IAAIC,MACR,CAAC,kDAAkD,EAAEP,KAAK,+gBAA+gB,EAAEM,aAAaC,QAAQD,EAAEE,OAAO,GAAG,iBAAiB;IAEjoB;IAEA,0DAA0D;IAC1D,IAAIL,oBAAoBE,YAAY,CAACF,iBAAiB,EAAE;QACtDF,SAASI,YAAY,CAACF,iBAAiB;IACzC;IAEA,uCAAuC;IACvC,IAAI,CAACF,UAAUI,aAAaI,OAAO,EAAE;QACnCR,SAASI,aAAaI,OAAO;IAC/B;IAEA,qCAAqC;IACrC,IAAI,CAACR,QAAQ;QACXA,SAASI;IACX;IAEA,OAAOJ;AACT;AAEA;;;;CAIC,GACD,OAAO,eAAeS,yBAAyBC,UAAuB;IACpE,IAAI,CAACA,YAAY;QACf,MAAM,IAAIJ,MAAM;IAClB;IACA,IAAI,OAAOI,WAAWC,OAAO,KAAK,YAAY;QAC5C,OAAOD,WAAWC,OAAO;IAC3B,OAAO;QACL,OAAO,MAAMb,kBAAyCY,WAAWC,OAAO;IAC1E;AACF"}

package/dist/queues/operations/runJobs/runJob/index.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/queues/operations/runJobs/runJob/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,sBAAsB,CAAA;AAC/C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAA;AAChE,OAAO,KAAK,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,wCAAwC,CAAA;AAC7F,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAA;AACzD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAA;~~AAQlE~~,KAAK,IAAI,GAAG;IACV,GAAG,EAAE,GAAG,CAAA;IACR,GAAG,EAAE,cAAc,CAAA;IACnB;;;;;;;OAOG;IACH,MAAM,CAAC,EAAE,aAAa,CAAA;IACtB,SAAS,EAAE,iBAAiB,CAAA;IAC5B,cAAc,EAAE,cAAc,CAAA;IAC9B,eAAe,EAAE,eAAe,CAAA;CACjC,CAAA;AAED,MAAM,MAAM,YAAY,GAAG,OAAO,GAAG,2BAA2B,GAAG,SAAS,CAAA;AAE5E,MAAM,MAAM,YAAY,GAAG;IACzB,MAAM,EAAE,YAAY,CAAA;CACrB,CAAA;AAED,eAAO,MAAM,MAAM,sEAOhB,IAAI,KAAG,OAAO,CAAC,YAAY,CA6D7B,CAAA"}
1	+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/queues/operations/runJobs/runJob/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,sBAAsB,CAAA;AAC/C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAA;AAChE,OAAO,KAAK,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,wCAAwC,CAAA;AAC7F,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAA;AACzD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAA;AAalE,KAAK,IAAI,GAAG;IACV,GAAG,EAAE,GAAG,CAAA;IACR,GAAG,EAAE,cAAc,CAAA;IACnB;;;;;;;OAOG;IACH,MAAM,CAAC,EAAE,aAAa,CAAA;IACtB,SAAS,EAAE,iBAAiB,CAAA;IAC5B,cAAc,EAAE,cAAc,CAAA;IAC9B,eAAe,EAAE,eAAe,CAAA;CACjC,CAAA;AAED,MAAM,MAAM,YAAY,GAAG,OAAO,GAAG,2BAA2B,GAAG,SAAS,CAAA;AAE5E,MAAM,MAAM,YAAY,GAAG;IACzB,MAAM,EAAE,YAAY,CAAA;CACrB,CAAA;AAED,eAAO,MAAM,MAAM,sEAOhB,IAAI,KAAG,OAAO,CAAC,YAAY,CA6D7B,CAAA"}

package/dist/queues/operations/runJobs/runJob/index.js CHANGED Viewed

@@ -1,6 +1,6 @@
 import { handleTaskError } from '../../../errors/handleTaskError.js';
 import { handleWorkflowError } from '../../../errors/handleWorkflowError.js';
-import { JobCancelledError, TaskError, WorkflowError } from '../../../errors/index.js';
+import { JobCancelledError, JobRunAbortedError, TaskError, WorkflowError } from '../../../errors/index.js';
 import { getCurrentDate } from '../../../utilities/getCurrentDate.js';
 import { getRunTaskFunction } from './getRunTaskFunction.js';
 export const runJob = async ({ job, req, silent, updateJob, workflowConfig, workflowHandler })=>{
@@ -13,8 +13,8 @@ export const runJob = async ({ job, req, silent, updateJob, workflowConfig, work
             tasks: getRunTaskFunction(job, workflowConfig, req, false, updateJob)
         });
     } catch (error) {
-        if (error instanceof JobCancelledError) {
-            throw error // Job cancellation is handled in a top-level error handler, as higher up code may themselves throw this error
+        if (error instanceof JobCancelledError || error instanceof JobRunAbortedError) {
+            throw error // Job run aborts are handled by the top-level runner.
             ;
         }
         if (error instanceof TaskError) {
@@ -48,7 +48,7 @@ export const runJob = async ({ job, req, silent, updateJob, workflowConfig, work
     // Job log modifications are already updated at the end of the runTask function.
     await updateJob({
         completedAt: getCurrentDate().toISOString(),
-        processing: false,
+        processingUntil: null,
         totalTried: (job.totalTried ?? 0) + 1
     });
     return {

package/dist/queues/operations/runJobs/runJob/index.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"sources":["../../../../../src/queues/operations/runJobs/runJob/index.ts"],"sourcesContent":["import type { Job } from '../../../../index.js'\nimport type { PayloadRequest } from '../../../../types/index.js'\nimport type { WorkflowConfig, WorkflowHandler } from '../../../config/types/workflowTypes.js'\nimport type { RunJobsSilent } from '../../../localAPI.js'\nimport type { UpdateJobFunction } from './getUpdateJobFunction.js'\n\nimport { handleTaskError } from '../../../errors/handleTaskError.js'\nimport { handleWorkflowError } from '../../../errors/handleWorkflowError.js'\nimport { JobCancelledError, TaskError, WorkflowError } from '../../../errors/index.js'\nimport { getCurrentDate } from '../../../utilities/getCurrentDate.js'\nimport { getRunTaskFunction } from './getRunTaskFunction.js'\n\ntype Args = {\n job: Job\n req: PayloadRequest\n /*\n If set to true, the job system will not log any output to the console (for both info and error logs).\n * Can be an option for more granular control over logging.\n \n This will not automatically affect user-configured logs (e.g. if you call `console.log` or `payload.logger.info` in your job code).\n \n @default false\n */\n silent?: RunJobsSilent\n updateJob: UpdateJobFunction\n workflowConfig: WorkflowConfig\n workflowHandler: WorkflowHandler\n}\n\nexport type JobRunStatus = 'error' \| 'error-reached-max-retries' \| 'success'\n\nexport type RunJobResult = {\n status: JobRunStatus\n}\n\nexport const runJob = async ({\n job,\n req,\n silent,\n updateJob,\n workflowConfig,\n workflowHandler,\n}: Args): Promise<RunJobResult> => {\n // Run the job\n try {\n await workflowHandler({\n inlineTask: getRunTaskFunction(job, workflowConfig, req, true, updateJob),\n job,\n req,\n tasks: getRunTaskFunction(job, workflowConfig, req, false, updateJob),\n })\n } catch (error) {\n if (error instanceof JobCancelledError) {\n throw error // Job ~~cancellation~~ is handled in a top-level ~~error handler, as higher up code may themselves throw this error\~~n }\n if (error instanceof TaskError) {\n const { hasFinalError } = await handleTaskError({\n error,\n req,\n silent,\n updateJob,\n })\n\n return {\n status: hasFinalError ? 'error-reached-max-retries' : 'error',\n }\n }\n\n const { hasFinalError } = await handleWorkflowError({\n error:\n error instanceof WorkflowError\n ? error\n : new WorkflowError({\n job,\n message:\n typeof error === 'object' && error && 'message' in error\n ? (error.message as string)\n : 'An unhandled error occurred',\n workflowConfig,\n }),\n req,\n silent,\n updateJob,\n })\n\n return {\n status: hasFinalError ? 'error-reached-max-retries' : 'error',\n }\n }\n\n // Workflow has completed successfully\n // Do not update the job log here, as that would result in unnecessary db calls when using postgres.\n // Solely updating simple fields here will result in optimized db calls.\n // Job log modifications are already updated at the end of the runTask function.\n await updateJob({\n completedAt: getCurrentDate().toISOString(),\n ~~processing~~: ~~false~~,\n totalTried: (job.totalTried ?? 0) + 1,\n })\n\n return {\n status: 'success',\n }\n}\n"],"names":["handleTaskError","handleWorkflowError","JobCancelledError","TaskError","WorkflowError","getCurrentDate","getRunTaskFunction","runJob","job","req","silent","updateJob","workflowConfig","workflowHandler","inlineTask","tasks","error","hasFinalError","status","message","completedAt","toISOString","~~processing~~","totalTried"],"mappings":"AAMA,SAASA,eAAe,QAAQ,qCAAoC;AACpE,SAASC,mBAAmB,QAAQ,yCAAwC;AAC5E,~~SAASC~~,iBAAiB,~~EAAEC~~,SAAS,~~EAAEC~~,aAAa,~~QAAQ~~,2BAA0B;~~AACtF~~,SAASC,cAAc,QAAQ,uCAAsC;AACrE,SAASC,kBAAkB,QAAQ,0BAAyB;AAyB5D,OAAO,MAAMC,SAAS,OAAO,EAC3BC,GAAG,EACHC,GAAG,EACHC,MAAM,EACNC,SAAS,EACTC,cAAc,EACdC,eAAe,EACV;IACL,cAAc;IACd,IAAI;QACF,MAAMA,gBAAgB;YACpBC,YAAYR,mBAAmBE,KAAKI,gBAAgBH,KAAK,MAAME;YAC/DH;YACAC;YACAM,OAAOT,mBAAmBE,KAAKI,gBAAgBH,KAAK,OAAOE;QAC7D;IACF,EAAE,OAAOK,OAAO;QACd,IAAIA,iBAAiBd,~~mBAAmB~~;~~YACtC~~,MAAMc,MAAM,~~8GAA8G~~;;~~QAC5H~~;QACA,IAAIA,iBAAiBb,WAAW;YAC9B,MAAM,EAAEc,aAAa,EAAE,GAAG,~~MAAMjB~~,gBAAgB;~~gBAC9CgB~~;gBACAP;gBACAC;gBACAC;YACF;YAEA,OAAO;gBACLO,QAAQD,gBAAgB,8BAA8B;YACxD;QACF;QAEA,MAAM,EAAEA,aAAa,EAAE,GAAG,~~MAAMhB~~,oBAAoB;~~YAClDe~~,OACEA,iBAAiBZ,gBACbY,QACA,IAAIZ,cAAc;gBAChBI;gBACAW,SACE,OAAOH,UAAU,YAAYA,SAAS,aAAaA,QAC9CA,MAAMG,OAAO,GACd;gBACNP;YACF;YACNH;YACAC;YACAC;QACF;QAEA,OAAO;YACLO,QAAQD,gBAAgB,8BAA8B;QACxD;IACF;IAEA,sCAAsC;IACtC,oGAAoG;IACpG,wEAAwE;IACxE,gFAAgF;IAChF,MAAMN,UAAU;QACdS,aAAaf,iBAAiBgB,WAAW;QACzCC,~~YAAY~~;~~QACZC~~,YAAY,AAACf,CAAAA,IAAIe,UAAU,IAAI,CAAA,IAAK;IACtC;IAEA,OAAO;QACLL,QAAQ;IACV;AACF,EAAC"}
1	+ {"version":3,"sources":["../../../../../src/queues/operations/runJobs/runJob/index.ts"],"sourcesContent":["import type { Job } from '../../../../index.js'\nimport type { PayloadRequest } from '../../../../types/index.js'\nimport type { WorkflowConfig, WorkflowHandler } from '../../../config/types/workflowTypes.js'\nimport type { RunJobsSilent } from '../../../localAPI.js'\nimport type { UpdateJobFunction } from './getUpdateJobFunction.js'\n\nimport { handleTaskError } from '../../../errors/handleTaskError.js'\nimport { handleWorkflowError } from '../../../errors/handleWorkflowError.js'\nimport {\n JobCancelledError,\n JobRunAbortedError,\n TaskError,\n WorkflowError,\n} from '../../../errors/index.js'\nimport { getCurrentDate } from '../../../utilities/getCurrentDate.js'\nimport { getRunTaskFunction } from './getRunTaskFunction.js'\n\ntype Args = {\n job: Job\n req: PayloadRequest\n /*\n If set to true, the job system will not log any output to the console (for both info and error logs).\n * Can be an option for more granular control over logging.\n \n This will not automatically affect user-configured logs (e.g. if you call `console.log` or `payload.logger.info` in your job code).\n \n @default false\n */\n silent?: RunJobsSilent\n updateJob: UpdateJobFunction\n workflowConfig: WorkflowConfig\n workflowHandler: WorkflowHandler\n}\n\nexport type JobRunStatus = 'error' \| 'error-reached-max-retries' \| 'success'\n\nexport type RunJobResult = {\n status: JobRunStatus\n}\n\nexport const runJob = async ({\n job,\n req,\n silent,\n updateJob,\n workflowConfig,\n workflowHandler,\n}: Args): Promise<RunJobResult> => {\n // Run the job\n try {\n await workflowHandler({\n inlineTask: getRunTaskFunction(job, workflowConfig, req, true, updateJob),\n job,\n req,\n tasks: getRunTaskFunction(job, workflowConfig, req, false, updateJob),\n })\n } catch (error) {\n if (error instanceof JobCancelledError \|\| error instanceof JobRunAbortedError) {\n throw error // Job run aborts are handled by the top-level runner.\n }\n if (error instanceof TaskError) {\n const { hasFinalError } = await handleTaskError({\n error,\n req,\n silent,\n updateJob,\n })\n\n return {\n status: hasFinalError ? 'error-reached-max-retries' : 'error',\n }\n }\n\n const { hasFinalError } = await handleWorkflowError({\n error:\n error instanceof WorkflowError\n ? error\n : new WorkflowError({\n job,\n message:\n typeof error === 'object' && error && 'message' in error\n ? (error.message as string)\n : 'An unhandled error occurred',\n workflowConfig,\n }),\n req,\n silent,\n updateJob,\n })\n\n return {\n status: hasFinalError ? 'error-reached-max-retries' : 'error',\n }\n }\n\n // Workflow has completed successfully\n // Do not update the job log here, as that would result in unnecessary db calls when using postgres.\n // Solely updating simple fields here will result in optimized db calls.\n // Job log modifications are already updated at the end of the runTask function.\n await updateJob({\n completedAt: getCurrentDate().toISOString(),\n processingUntil: null,\n totalTried: (job.totalTried ?? 0) + 1,\n })\n\n return {\n status: 'success',\n }\n}\n"],"names":["handleTaskError","handleWorkflowError","JobCancelledError","JobRunAbortedError","TaskError","WorkflowError","getCurrentDate","getRunTaskFunction","runJob","job","req","silent","updateJob","workflowConfig","workflowHandler","inlineTask","tasks","error","hasFinalError","status","message","completedAt","toISOString","processingUntil","totalTried"],"mappings":"AAMA,SAASA,eAAe,QAAQ,qCAAoC;AACpE,SAASC,mBAAmB,QAAQ,yCAAwC;AAC5E,SACEC,iBAAiB,EACjBC,kBAAkB,EAClBC,SAAS,EACTC,aAAa,QACR,2BAA0B;AACjC,SAASC,cAAc,QAAQ,uCAAsC;AACrE,SAASC,kBAAkB,QAAQ,0BAAyB;AAyB5D,OAAO,MAAMC,SAAS,OAAO,EAC3BC,GAAG,EACHC,GAAG,EACHC,MAAM,EACNC,SAAS,EACTC,cAAc,EACdC,eAAe,EACV;IACL,cAAc;IACd,IAAI;QACF,MAAMA,gBAAgB;YACpBC,YAAYR,mBAAmBE,KAAKI,gBAAgBH,KAAK,MAAME;YAC/DH;YACAC;YACAM,OAAOT,mBAAmBE,KAAKI,gBAAgBH,KAAK,OAAOE;QAC7D;IACF,EAAE,OAAOK,OAAO;QACd,IAAIA,iBAAiBf,qBAAqBe,iBAAiBd,oBAAoB;YAC7E,MAAMc,MAAM,sDAAsD;;QACpE;QACA,IAAIA,iBAAiBb,WAAW;YAC9B,MAAM,EAAEc,aAAa,EAAE,GAAG,MAAMlB,gBAAgB;gBAC9CiB;gBACAP;gBACAC;gBACAC;YACF;YAEA,OAAO;gBACLO,QAAQD,gBAAgB,8BAA8B;YACxD;QACF;QAEA,MAAM,EAAEA,aAAa,EAAE,GAAG,MAAMjB,oBAAoB;YAClDgB,OACEA,iBAAiBZ,gBACbY,QACA,IAAIZ,cAAc;gBAChBI;gBACAW,SACE,OAAOH,UAAU,YAAYA,SAAS,aAAaA,QAC9CA,MAAMG,OAAO,GACd;gBACNP;YACF;YACNH;YACAC;YACAC;QACF;QAEA,OAAO;YACLO,QAAQD,gBAAgB,8BAA8B;QACxD;IACF;IAEA,sCAAsC;IACtC,oGAAoG;IACpG,wEAAwE;IACxE,gFAAgF;IAChF,MAAMN,UAAU;QACdS,aAAaf,iBAAiBgB,WAAW;QACzCC,iBAAiB;QACjBC,YAAY,AAACf,CAAAA,IAAIe,UAAU,IAAI,CAAA,IAAK;IACtC;IAEA,OAAO;QACLL,QAAQ;IACV;AACF,EAAC"}

package/dist/queues/utilities/getCurrentDate.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"getCurrentDate.d.ts","sourceRoot":"","sources":["../../../src/queues/utilities/getCurrentDate.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,eAAO,MAAM,0BAA0B~~;;;;CAMtC~~,CAAA;AAED,wBAAgB,+BAA+B,SAI9C;AAED,eAAO,MAAM,cAAc,EAAE,MAAM,IAElC,CAAA"}
1	+ {"version":3,"file":"getCurrentDate.d.ts","sourceRoot":"","sources":["../../../src/queues/utilities/getCurrentDate.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,eAAO,MAAM,0BAA0B;IACrC,cAAc;IAGd,aAAa;IACb,kBAAkB;CACnB,CAAA;AAED,wBAAgB,+BAA+B,SAI9C;AAED,eAAO,MAAM,cAAc,EAAE,MAAM,IAElC,CAAA"}

package/dist/queues/utilities/updateJob.d.ts CHANGED Viewed

@@ -2,8 +2,6 @@ import type { Job } from '../../index.js';
 import type { PayloadRequest, Sort, Where } from '../../types/index.js';
 type BaseArgs = {
     data: Partial<Job>;
-    depth?: number;
-    disableTransaction?: boolean;
     limit?: number;
     req: PayloadRequest;
     returning?: boolean;
@@ -30,6 +28,6 @@ export declare function updateJob(args: ArgsByID & BaseArgs): Promise<Job | unde
  * Handles deciding whether it can used direct db methods or not, and if so,
  * manually runs the afterRead hook that populates the `taskStatus` property.
  */
-export declare function updateJobs({ id, data, depth, disableTransaction, limit: limitArg, req, returning, sort, where: whereArg, }: RunJobsArgs): Promise<Job[] | null>;
+export declare function updateJobs({ id, data, limit: limitArg, req, returning, sort, where: whereArg, }: RunJobsArgs): Promise<Job[] | null>;
 export {};
 //# sourceMappingURL=updateJob.d.ts.map

package/dist/queues/utilities/updateJob.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"updateJob.d.ts","sourceRoot":"","sources":["../../../src/queues/utilities/updateJob.ts"],"names":[],"mappings":"~~AAEA~~,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAA;AACzC,OAAO,KAAK,EAAE,cAAc,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAA;~~AAKvE~~,KAAK,QAAQ,GAAG;IACd,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,CAAA;IAClB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,~~kBAAkB,CAAC,EAAE,OAAO,CAAA;IAC5B,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,~~GAAG,EAAE,cAAc,CAAA;IACnB,SAAS,CAAC,EAAE,OAAO,CAAA;CACpB,CAAA;AAED,KAAK,QAAQ,GAAG;IACd,EAAE,EAAE,MAAM,GAAG,MAAM,CAAA;IACnB,KAAK,CAAC,EAAE,KAAK,CAAA;IACb,IAAI,CAAC,EAAE,KAAK,CAAA;IACZ,KAAK,CAAC,EAAE,KAAK,CAAA;CACd,CAAA;AAED,KAAK,SAAS,GAAG;IACf,EAAE,CAAC,EAAE,KAAK,CAAA;IACV,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,IAAI,CAAC,EAAE,IAAI,CAAA;IACX,KAAK,EAAE,KAAK,CAAA;CACb,CAAA;AAED,KAAK,WAAW,GAAG,CAAC,QAAQ,GAAG,SAAS,CAAC,GAAG,QAAQ,CAAA;AAEpD;;GAEG;AACH,wBAAsB,SAAS,CAAC,IAAI,EAAE,QAAQ,GAAG,QAAQ,4BAKxD;AAED;;;;GAIG;AACH,wBAAsB,UAAU,CAAC,EAC/B,EAAE,EACF,IAAI,EACJ,KAAK,~~EACL,kBAAkB,EAClB,KAAK,~~EAAE,QAAQ,EACf,GAAG,EACH,SAAS,EACT,IAAI,EACJ,KAAK,EAAE,QAAQ,GAChB,EAAE,WAAW,GAAG,OAAO,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,CAiErC"}
1	+ {"version":3,"file":"updateJob.d.ts","sourceRoot":"","sources":["../../../src/queues/utilities/updateJob.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAA;AACzC,OAAO,KAAK,EAAE,cAAc,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAA;AAMvE,KAAK,QAAQ,GAAG;IACd,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,CAAA;IAClB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,GAAG,EAAE,cAAc,CAAA;IACnB,SAAS,CAAC,EAAE,OAAO,CAAA;CACpB,CAAA;AAED,KAAK,QAAQ,GAAG;IACd,EAAE,EAAE,MAAM,GAAG,MAAM,CAAA;IACnB,KAAK,CAAC,EAAE,KAAK,CAAA;IACb,IAAI,CAAC,EAAE,KAAK,CAAA;IACZ,KAAK,CAAC,EAAE,KAAK,CAAA;CACd,CAAA;AAED,KAAK,SAAS,GAAG;IACf,EAAE,CAAC,EAAE,KAAK,CAAA;IACV,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,IAAI,CAAC,EAAE,IAAI,CAAA;IACX,KAAK,EAAE,KAAK,CAAA;CACb,CAAA;AAED,KAAK,WAAW,GAAG,CAAC,QAAQ,GAAG,SAAS,CAAC,GAAG,QAAQ,CAAA;AAEpD;;GAEG;AACH,wBAAsB,SAAS,CAAC,IAAI,EAAE,QAAQ,GAAG,QAAQ,4BAKxD;AAED;;;;GAIG;AACH,wBAAsB,UAAU,CAAC,EAC/B,EAAE,EACF,IAAI,EACJ,KAAK,EAAE,QAAQ,EACf,GAAG,EACH,SAAS,EACT,IAAI,EACJ,KAAK,EAAE,QAAQ,GAChB,EAAE,WAAW,GAAG,OAAO,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,CAiErC"}

package/dist/queues/utilities/updateJob.js CHANGED Viewed

@@ -1,4 +1,5 @@
-import { jobAfterRead, jobsCollectionSlug } from '../config/collection.js';
+import { assertNoValidationWrite } from '../../utilities/assertNoValidationWrite.js';
+import { jobAfterRead } from '../config/collection.js';
 import { getCurrentDate } from './getCurrentDate.js';
 /**
  * Convenience method for updateJobs by id
@@ -12,32 +13,21 @@ import { getCurrentDate } from './getCurrentDate.js';
  * Helper for updating jobs in the most performant way possible.
  * Handles deciding whether it can used direct db methods or not, and if so,
  * manually runs the afterRead hook that populates the `taskStatus` property.
- */ export async function updateJobs({ id, data, depth, disableTransaction, limit: limitArg, req, returning, sort, where: whereArg }) {
+ */ export async function updateJobs({ id, data, limit: limitArg, req, returning, sort, where: whereArg }) {
+    assertNoValidationWrite(req);
     const limit = id ? 1 : limitArg;
     const where = id ? {
         id: {
             equals: id
         }
     } : whereArg;
-    if (depth || req.payload.config?.jobs?.runHooks) {
-        const result = await req.payload.update({
-            id,
-            collection: jobsCollectionSlug,
-            data,
-            depth,
-            disableTransaction,
-            limit,
-            req,
-            where
-        });
-        if (returning === false || !result) {
-            return null;
-        }
-        return result.docs;
-    }
+    const transactionID = req.payload.db.name !== 'mongoose' ? await req.payload.db.beginTransaction() : undefined;
     const jobReq = {
-        transactionID: req.payload.db.name !== 'mongoose' ? await req.payload.db.beginTransaction() : undefined
+        transactionID: transactionID ?? undefined
     };
+    if (data.processingUntil === null) {
+        data.processingToken = null;
+    }
     if (typeof data.updatedAt === 'undefined') {
         // Ensure updatedAt date is always updated
         data.updatedAt = getCurrentDate().toISOString();
@@ -55,9 +45,21 @@ import { getCurrentDate } from './getCurrentDate.js';
         sort,
         where: where
     };
-    const updatedJobs = await req.payload.db.updateJobs(args);
-    if (req.payload.db.name !== 'mongoose' && jobReq.transactionID) {
-        await req.payload.db.commitTransaction(jobReq.transactionID);
+    let updatedJobs;
+    try {
+        updatedJobs = await req.payload.db.updateJobs(args);
+        if (transactionID !== null && typeof transactionID !== 'undefined') {
+            await req.payload.db.commitTransaction(transactionID);
+        }
+    } catch (error) {
+        if (transactionID !== null && typeof transactionID !== 'undefined') {
+            try {
+                await req.payload.db.rollbackTransaction(transactionID);
+            } catch  {
+            // Preserve the update or commit error that caused the rollback.
+            }
+        }
+        throw error;
     }
     if (returning === false || !updatedJobs?.length) {
         return null;

package/dist/queues/utilities/updateJob.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"sources":["../../../src/queues/utilities/updateJob.ts"],"sourcesContent":["import type { ~~ManyOptions } from '../../collections/operations/local/update.js'\nimport type {~~ UpdateJobsArgs } from '../../database/types.js'\nimport type { Job } from '../../index.js'\nimport type { PayloadRequest, Sort, Where } from '../../types/index.js'\n\nimport { jobAfterRead, ~~jobsCollectionSlug~~ } from '../config/collection.js'\nimport { getCurrentDate } from './getCurrentDate.js'\n\ntype BaseArgs = {\n data: Partial<Job>\n ~~depth?: number\n disableTransaction?: boolean\n~~ limit?: number\n req: PayloadRequest\n returning?: boolean\n}\n\ntype ArgsByID = {\n id: number \| string\n limit?: never\n sort?: never\n where?: never\n}\n\ntype ArgsWhere = {\n id?: never\n limit?: number\n sort?: Sort\n where: Where\n}\n\ntype RunJobsArgs = (ArgsByID \| ArgsWhere) & BaseArgs\n\n/*\n Convenience method for updateJobs by id\n /\nexport async function updateJob(args: ArgsByID & BaseArgs) {\n const result = await updateJobs(args)\n if (result) {\n return result[0]\n }\n}\n\n/\n Helper for updating jobs in the most performant way possible.\n * Handles deciding whether it can used direct db methods or not, and if so,\n * manually runs the afterRead hook that populates the `taskStatus` property.\n */\nexport async function updateJobs({\n id,\n data,\n ~~depth,\n disableTransaction,\n~~ limit: limitArg,\n req,\n returning,\n sort,\n where: whereArg,\n}: RunJobsArgs): Promise<Job[] \| null> {\n const limit = id ? 1 : limitArg\n const where = id ? { id: { equals: id } } : whereArg\n\n if ~~(depth~~ \|\| req.payload.~~config?.jobs?.runHooks)~~ ~~{\n const~~ ~~result~~ = await req.payload.~~update~~(~~{\n id,\n collection~~: ~~jobsCollectionSlug,\n data,\n depth,\n disableTransaction,\n limit,\n req,\n where,\n } as ManyOptions<any, any>)~~\n if ~~(returning~~ ~~===~~ ~~false~~ \|\| ~~!result)~~ ~~{\n return~~ ~~null\n }\n return~~ ~~result.docs as Job[]\n~~ }\n\n ~~const~~ ~~jobReq~~ = {\n ~~transactionID:\n req~~.~~payload.db.name~~ ~~!==~~ ~~'mongoose'~~\n ~~? ((await req.payload.db.beginTransaction()) as string)\n : undefined,\n~~ }\n\n if (typeof data.updatedAt === 'undefined') {\n // Ensure updatedAt date is always updated\n data.updatedAt = getCurrentDate().toISOString()\n }\n\n const args: UpdateJobsArgs = id\n ? {\n id,\n data,\n req: jobReq,\n returning,\n }\n : {\n data,\n limit,\n req: jobReq,\n returning,\n sort,\n where: where as Where,\n }\n\n ~~const~~ updatedJobs: Job[] \| null = await req.payload.db.updateJobs(args)\n\n if (req.payload.db.~~name~~ !== ~~'mongoose'~~ && ~~jobReq.~~transactionID) {\n await req.payload.db.~~commitTransaction~~(~~jobReq.~~transactionID)\n }\n\n if (returning === false \|\| !updatedJobs?.length) {\n return null\n }\n\n return updatedJobs.map((updatedJob) => {\n return jobAfterRead({\n config: req.payload.config,\n doc: updatedJob,\n })\n })\n}\n"],"names":["~~jobAfterRead~~","~~jobsCollectionSlug~~","getCurrentDate","updateJob","args","result","updateJobs","id","data","~~depth","disableTransaction","~~limit","limitArg","req","returning","sort","where","whereArg","equals","~~payload~~","~~config~~","~~jobs~~","~~runHooks~~","~~update~~","~~collection~~","~~docs","~~jobReq","~~transactionID~~","db","~~name~~","~~beginTransaction~~","~~undefined~~","~~updatedAt~~","~~toISOString~~","~~updatedJobs~~","~~commitTransaction","~~length","map","updatedJob","doc"],"mappings":"~~AAKA~~,SAASA,~~YAAY~~,~~EAAEC~~,~~kBAAkB~~,QAAQ,0BAAyB;~~AAC1E~~,SAASC,cAAc,QAAQ,sBAAqB;~~AA2BpD~~;;CAEC,GACD,OAAO,eAAeC,UAAUC,IAAyB;IACvD,MAAMC,SAAS,MAAMC,WAAWF;IAChC,IAAIC,QAAQ;QACV,OAAOA,MAAM,CAAC,EAAE;IAClB;AACF;AAEA;;;;CAIC,GACD,OAAO,eAAeC,WAAW,EAC/BC,EAAE,EACFC,IAAI,EACJC,~~KAAK,EACLC,kBAAkB,EAClBC,~~OAAOC,QAAQ,EACfC,GAAG,EACHC,SAAS,EACTC,IAAI,EACJC,OAAOC,QAAQ,EACH;~~IACZ~~,~~MAAMN~~,~~QAAQJ~~,KAAK,~~IAAIK~~;IACvB,MAAMI,~~QAAQT~~,KAAK;QAAEA,IAAI;~~YAAEW~~,~~QAAQX~~;QAAG;IAAE,~~IAAIU~~;IAE5C,~~IAAIR~~,~~SAASI~~,~~IAAIM~~,OAAO,CAACC,~~MAAM~~,~~EAAEC~~,~~MAAMC~~,~~UAAU;QAC/C~~,~~MAAMjB~~,~~SAAS~~,~~MAAMQ~~,~~IAAIM,~~OAAO,~~CAACI~~,~~MAAM~~,~~CAAC;YACtChB;YACAiB~~,~~YAAYvB~~;~~YACZO;YACAC;YACAC;YACAC;YACAE;YACAG;QACF;QACA~~,~~IAAIF~~,~~cAAc,~~SAAS~~,CAACT,QAAQ~~;~~YAClC~~,~~OAAO;QACT;QACA~~,~~OAAOA,OAAOoB,IAAI~~;~~IACpB~~;~~IAEA~~,~~MAAMC~~,~~SAAS;QACbC~~,~~eACEd~~,~~IAAIM,OAAO,CAACS,EAAE,CAACC,IAAI,~~KAAK,~~aAClB~~,~~MAAMhB~~,~~IAAIM~~,~~OAAO,CAACS,EAAE,CAACE,gBAAgB,KACvCC~~;~~IACR~~;IAEA,IAAI,~~OAAOvB~~,~~KAAKwB~~,SAAS,KAAK,aAAa;QACzC,0CAA0C;~~QAC1CxB~~,~~KAAKwB~~,SAAS,~~GAAG9B~~,~~iBAAiB+B~~,WAAW;IAC/C;IAEA,~~MAAM7B~~,OAAuBG,KACzB;QACEA;QACAC;~~QACAK~~,~~KAAKa~~;~~QACLZ~~;IACF,IACA;~~QACEN~~;~~QACAG~~;QACAE,~~KAAKa~~;~~QACLZ~~;QACAC;QACAC,OAAOA;IACT;IAEJ,~~MAAMkB~~,~~cAA4B~~,~~MAAMrB~~,~~IAAIM~~,OAAO,~~CAACS~~,EAAE,~~CAACtB~~,UAAU,CAACF;~~IAElE~~,~~IAAIS~~,~~IAAIM~~,OAAO,~~CAACS~~,EAAE,~~CAACC~~,~~IAAI~~,~~KAAK~~,~~cAAcH~~,~~OAAOC~~,aAAa,~~EAAE~~;~~QAC9D~~,~~MAAMd~~,~~IAAIM~~,OAAO,~~CAACS~~,EAAE,~~CAACO~~,~~iBAAiB~~,~~CAACT~~,~~OAAOC~~,~~aAAa~~;~~IAC7D~~;IAEA,~~IAAIb~~,cAAc,SAAS,~~CAACoB~~,~~aAAaE~~,QAAQ;QAC/C,OAAO;IACT;IAEA,~~OAAOF~~,~~YAAYG~~,GAAG,CAAC,CAACC;QACtB,~~OAAOtC~~,aAAa;~~YAClBoB~~,~~QAAQP~~,~~IAAIM~~,OAAO,~~CAACC~~,MAAM;~~YAC1BmB~~,~~KAAKD~~;QACP;IACF;AACF"}
1	+ {"version":3,"sources":["../../../src/queues/utilities/updateJob.ts"],"sourcesContent":["import type { UpdateJobsArgs } from '../../database/types.js'\nimport type { Job } from '../../index.js'\nimport type { PayloadRequest, Sort, Where } from '../../types/index.js'\n\nimport { assertNoValidationWrite } from '../../utilities/assertNoValidationWrite.js'\nimport { jobAfterRead } from '../config/collection.js'\nimport { getCurrentDate } from './getCurrentDate.js'\n\ntype BaseArgs = {\n data: Partial<Job>\n limit?: number\n req: PayloadRequest\n returning?: boolean\n}\n\ntype ArgsByID = {\n id: number \| string\n limit?: never\n sort?: never\n where?: never\n}\n\ntype ArgsWhere = {\n id?: never\n limit?: number\n sort?: Sort\n where: Where\n}\n\ntype RunJobsArgs = (ArgsByID \| ArgsWhere) & BaseArgs\n\n/*\n Convenience method for updateJobs by id\n /\nexport async function updateJob(args: ArgsByID & BaseArgs) {\n const result = await updateJobs(args)\n if (result) {\n return result[0]\n }\n}\n\n/\n Helper for updating jobs in the most performant way possible.\n * Handles deciding whether it can used direct db methods or not, and if so,\n * manually runs the afterRead hook that populates the `taskStatus` property.\n */\nexport async function updateJobs({\n id,\n data,\n limit: limitArg,\n req,\n returning,\n sort,\n where: whereArg,\n}: RunJobsArgs): Promise<Job[] \| null> {\n assertNoValidationWrite(req)\n\n const limit = id ? 1 : limitArg\n const where = id ? { id: { equals: id } } : whereArg\n\n const transactionID =\n req.payload.db.name !== 'mongoose' ? await req.payload.db.beginTransaction() : undefined\n const jobReq = { transactionID: transactionID ?? undefined }\n\n if (data.processingUntil === null) {\n data.processingToken = null\n }\n\n if (typeof data.updatedAt === 'undefined') {\n // Ensure updatedAt date is always updated\n data.updatedAt = getCurrentDate().toISOString()\n }\n\n const args: UpdateJobsArgs = id\n ? {\n id,\n data,\n req: jobReq,\n returning,\n }\n : {\n data,\n limit,\n req: jobReq,\n returning,\n sort,\n where: where as Where,\n }\n\n let updatedJobs: Job[] \| null\n\n try {\n updatedJobs = await req.payload.db.updateJobs(args)\n\n if (transactionID !== null && typeof transactionID !== 'undefined') {\n await req.payload.db.commitTransaction(transactionID)\n }\n } catch (error) {\n if (transactionID !== null && typeof transactionID !== 'undefined') {\n try {\n await req.payload.db.rollbackTransaction(transactionID)\n } catch {\n // Preserve the update or commit error that caused the rollback.\n }\n }\n\n throw error\n }\n\n if (returning === false \|\| !updatedJobs?.length) {\n return null\n }\n\n return updatedJobs.map((updatedJob) => {\n return jobAfterRead({\n config: req.payload.config,\n doc: updatedJob,\n })\n })\n}\n"],"names":["assertNoValidationWrite","jobAfterRead","getCurrentDate","updateJob","args","result","updateJobs","id","data","limit","limitArg","req","returning","sort","where","whereArg","equals","transactionID","payload","db","name","beginTransaction","undefined","jobReq","processingUntil","processingToken","updatedAt","toISOString","updatedJobs","commitTransaction","error","rollbackTransaction","length","map","updatedJob","config","doc"],"mappings":"AAIA,SAASA,uBAAuB,QAAQ,6CAA4C;AACpF,SAASC,YAAY,QAAQ,0BAAyB;AACtD,SAASC,cAAc,QAAQ,sBAAqB;AAyBpD;;CAEC,GACD,OAAO,eAAeC,UAAUC,IAAyB;IACvD,MAAMC,SAAS,MAAMC,WAAWF;IAChC,IAAIC,QAAQ;QACV,OAAOA,MAAM,CAAC,EAAE;IAClB;AACF;AAEA;;;;CAIC,GACD,OAAO,eAAeC,WAAW,EAC/BC,EAAE,EACFC,IAAI,EACJC,OAAOC,QAAQ,EACfC,GAAG,EACHC,SAAS,EACTC,IAAI,EACJC,OAAOC,QAAQ,EACH;IACZf,wBAAwBW;IAExB,MAAMF,QAAQF,KAAK,IAAIG;IACvB,MAAMI,QAAQP,KAAK;QAAEA,IAAI;YAAES,QAAQT;QAAG;IAAE,IAAIQ;IAE5C,MAAME,gBACJN,IAAIO,OAAO,CAACC,EAAE,CAACC,IAAI,KAAK,aAAa,MAAMT,IAAIO,OAAO,CAACC,EAAE,CAACE,gBAAgB,KAAKC;IACjF,MAAMC,SAAS;QAAEN,eAAeA,iBAAiBK;IAAU;IAE3D,IAAId,KAAKgB,eAAe,KAAK,MAAM;QACjChB,KAAKiB,eAAe,GAAG;IACzB;IAEA,IAAI,OAAOjB,KAAKkB,SAAS,KAAK,aAAa;QACzC,0CAA0C;QAC1ClB,KAAKkB,SAAS,GAAGxB,iBAAiByB,WAAW;IAC/C;IAEA,MAAMvB,OAAuBG,KACzB;QACEA;QACAC;QACAG,KAAKY;QACLX;IACF,IACA;QACEJ;QACAC;QACAE,KAAKY;QACLX;QACAC;QACAC,OAAOA;IACT;IAEJ,IAAIc;IAEJ,IAAI;QACFA,cAAc,MAAMjB,IAAIO,OAAO,CAACC,EAAE,CAACb,UAAU,CAACF;QAE9C,IAAIa,kBAAkB,QAAQ,OAAOA,kBAAkB,aAAa;YAClE,MAAMN,IAAIO,OAAO,CAACC,EAAE,CAACU,iBAAiB,CAACZ;QACzC;IACF,EAAE,OAAOa,OAAO;QACd,IAAIb,kBAAkB,QAAQ,OAAOA,kBAAkB,aAAa;YAClE,IAAI;gBACF,MAAMN,IAAIO,OAAO,CAACC,EAAE,CAACY,mBAAmB,CAACd;YAC3C,EAAE,OAAM;YACN,gEAAgE;YAClE;QACF;QAEA,MAAMa;IACR;IAEA,IAAIlB,cAAc,SAAS,CAACgB,aAAaI,QAAQ;QAC/C,OAAO;IACT;IAEA,OAAOJ,YAAYK,GAAG,CAAC,CAACC;QACtB,OAAOjC,aAAa;YAClBkC,QAAQxB,IAAIO,OAAO,CAACiB,MAAM;YAC1BC,KAAKF;QACP;IACF;AACF"}

package/dist/types/constants.d.ts CHANGED Viewed

@@ -1,6 +1,27 @@
-export declare const validOperators: readonly ["equals", "contains", "not_equals", "in", "all", "not_in", "exists", "greater_than", "greater_than_equal", "less_than", "less_than_equal", "like", "not_like", "within", "intersects", "near"];
+/**
+ * Operators that apply a nested `where` query to documents in a non-polymorphic, has-many
+ * relationship or upload field.
+ *
+ * `contains` matches at least one related document, `not_equals` matches none, and `equals`
+ * matches every related document. These operators keep their existing behavior with normal values.
+ *
+ * @example
+ * ```ts
+ * const where = {
+ *   ingredients: {
+ *     not_equals: {
+ *       isHealthy: { equals: false },
+ *     },
+ *   },
+ * }
+ * ```
+ */
+export declare const hasManyRelationshipOperators: readonly ['contains', 'not_equals', 'equals'];
+export type HasManyRelationshipOperator = (typeof hasManyRelationshipOperators)[number];
+export declare const hasManyRelationshipOperatorSet: Set<"contains" | "equals" | "not_equals">;
+export declare const validOperators: readonly ['equals', 'contains', 'not_equals', 'in', 'all', 'not_in', 'exists', 'greater_than', 'greater_than_equal', 'less_than', 'less_than_equal', 'like', 'not_like', 'within', 'intersects', 'near'];
 export type Operator = (typeof validOperators)[number];
-export declare const validOperatorSet: Set<"all" | "contains" | "equals" | "exists" | "intersects" | "near" | "within" | "not_equals" | "in" | "not_in" | "greater_than" | "greater_than_equal" | "less_than" | "less_than_equal" | "like" | "not_like">;
+export declare const validOperatorSet: Set<"all" | "contains" | "equals" | "exists" | "greater_than" | "greater_than_equal" | "in" | "intersects" | "less_than" | "less_than_equal" | "like" | "near" | "not_equals" | "not_in" | "not_like" | "within">;
 /**
  * Matches a dot-separated path where each segment is a word character (a-zA-Z0-9_).
  * Used to validate field paths before they are processed by query builders.

package/dist/types/constants.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../src/types/constants.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,cAAc,~~0MAiBjB~~,CAAA;AAEV,MAAM,MAAM,QAAQ,GAAG,CAAC,OAAO,cAAc,CAAC,CAAC,MAAM,CAAC,CAAA;AAEtD,eAAO,MAAM,gBAAgB,mNAAoC,CAAA;AAEjE;;;GAGG;AACH,eAAO,MAAM,qBAAqB,QAAoB,CAAA"}
1	+ {"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../src/types/constants.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AACH,eAAO,MAAM,4BAA4B,YAAI,UAAU,EAAE,YAAY,EAAE,QAAQ,CAAU,CAAA;AAEzF,MAAM,MAAM,2BAA2B,GAAG,CAAC,OAAO,4BAA4B,CAAC,CAAC,MAAM,CAAC,CAAA;AAEvF,eAAO,MAAM,8BAA8B,2CAE1C,CAAA;AAED,eAAO,MAAM,cAAc,YACzB,QAAQ,EACR,UAAU,EACV,YAAY,EACZ,IAAI,EACJ,KAAK,EACL,QAAQ,EACR,QAAQ,EACR,cAAc,EACd,oBAAoB,EACpB,WAAW,EACX,iBAAiB,EACjB,MAAM,EACN,UAAU,EACV,QAAQ,EACR,YAAY,EACZ,MAAM,CACE,CAAA;AAEV,MAAM,MAAM,QAAQ,GAAG,CAAC,OAAO,cAAc,CAAC,CAAC,MAAM,CAAC,CAAA;AAEtD,eAAO,MAAM,gBAAgB,mNAAoC,CAAA;AAEjE;;;GAGG;AACH,eAAO,MAAM,qBAAqB,QAAoB,CAAA"}