@cedarjs/jobs 2.6.0 → 2.6.1-next.104

package/dist/adapters/PrismaAdapter/PrismaAdapter.d.ts

@@ -1,4 +1,3 @@
-import type { PrismaClient } from '@prisma/client';
 import type { BaseJob } from '../../types.js';
 import type { BaseAdapterOptions, SchedulePayload, FindArgs, SuccessOptions, ErrorOptions, FailureOptions } from '../BaseAdapter/BaseAdapter.js';
 import { BaseAdapter } from '../BaseAdapter/BaseAdapter.js';
@@ -14,16 +13,51 @@ export interface PrismaJob extends BaseJob {
     createdAt: Date;
     updatedAt: Date;
 }
-export interface PrismaAdapterOptions extends BaseAdapterOptions {
+interface PrismaAdapterDelegate {
+    findFirst(args: Record<string, unknown>): Promise<any>;
+    updateMany(args: Record<string, unknown>): Promise<{
+        count: number;
+    }>;
+    delete(args: Record<string, unknown>): Promise<unknown>;
+    update(args: Record<string, unknown>): Promise<unknown>;
+    create(args: Record<string, unknown>): Promise<unknown>;
+    deleteMany(args?: Record<string, unknown>): Promise<unknown>;
+}
+interface DelegateLike {
+    findFirst: (...args: any[]) => any;
+    updateMany: (...args: any[]) => any;
+    delete: (...args: any[]) => any;
+    update: (...args: any[]) => any;
+    create: (...args: any[]) => any;
+    deleteMany: (...args: any[]) => any;
+}
+type DelegateKey<TDb extends object> = Extract<{
+    [K in keyof TDb]-?: TDb[K] extends DelegateLike ? K : never;
+}[keyof TDb], string>;
+export interface PrismaAdapterOptions<TDb extends object = object> extends BaseAdapterOptions {
     /**
-     * An instance of PrismaClient which will be used to talk to the database
+     * An instance of PrismaClient which will be used to talk to the database.
+     *
+     * Typed generically so that `model` below is constrained to the model names
+     * that actually exist in the user's schema. When the user passes their typed
+     * db instance TypeScript infers TDb as the full generated client, giving
+     * autocomplete on model names. `PrismaClient` is only the lower bound — in
+     * v7 it may be a stub type, but TDb will still be inferred from the value
+     * passed at the call site.
      */
-    db: PrismaClient;
+    db: TDb;
     /**
-     * The name of the model in the Prisma schema that represents the job table.
-     * @default 'BackgroundJob'
+     * The camelCase name of the Prisma model accessor that represents the job
+     * table, i.e. the key you'd use on `db` to query it.
+     *
+     * For a Prisma schema model named `BackgroundJob` this would be
+     * `'backgroundJob'` (which is also the default). For a custom model named
+     * `Job` this would be `'job'`.
+     *
+     * @default 'BackgroundJob' for now, but will be 'backgroundJob' in the next
+     * major release.
      */
-    model?: string;
+    model?: DelegateKey<TDb> | string;
 }
 /**
  * Implements a job adapter using Prisma ORM.
@@ -49,12 +83,12 @@ export interface PrismaAdapterOptions extends BaseAdapterOptions {
  * }
  * ```
  */
-export declare class PrismaAdapter extends BaseAdapter<PrismaAdapterOptions> {
-    db: PrismaClient;
-    model: string;
-    accessor: PrismaClient[keyof PrismaClient];
+export declare class PrismaAdapter<TDb extends object = object> extends BaseAdapter<PrismaAdapterOptions<TDb>> {
+    db: TDb;
+    model: DelegateKey<TDb> | string;
+    accessor: PrismaAdapterDelegate;
     provider: string;
-    constructor(options: PrismaAdapterOptions);
+    constructor(options: PrismaAdapterOptions<TDb>);
     /**
      * Finds the next job to run, locking it so that no other process can pick it
      * The act of locking a job is dependant on the DB server, so we'll run some
@@ -68,4 +102,5 @@ export declare class PrismaAdapter extends BaseAdapter<PrismaAdapterOptions> {
     schedule({ name, path, args, runAt, cron, queue, priority, }: SchedulePayload): Promise<void>;
     clear(): Promise<void>;
 }
+export {};
 //# sourceMappingURL=PrismaAdapter.d.ts.map

package/dist/adapters/PrismaAdapter/PrismaAdapter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PrismaAdapter.d.ts","sourceRoot":"","sources":["../../../src/adapters/PrismaAdapter/PrismaAdapter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAIlD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAA;AAC7C,OAAO,KAAK,EACV,kBAAkB,EAClB,eAAe,EACf,QAAQ,EACR,cAAc,EACd,YAAY,EACZ,cAAc,EACf,MAAM,+BAA+B,CAAA;AACtC,OAAO,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAA;AAI3D,MAAM,WAAW,SAAU,SAAQ,OAAO;IACxC,EAAE,EAAE,MAAM,CAAA;IACV,OAAO,EAAE,MAAM,CAAA;IACf,KAAK,EAAE,IAAI,CAAA;IACX,IAAI,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAA;IAC/B,QAAQ,EAAE,IAAI,CAAA;IACd,QAAQ,EAAE,MAAM,CAAA;IAChB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAA;IACxB,QAAQ,EAAE,IAAI,GAAG,IAAI,CAAA;IACrB,SAAS,EAAE,IAAI,CAAA;IACf,SAAS,EAAE,IAAI,CAAA;CAChB;AAED,MAAM,WAAW,oBAAqB,SAAQ,kBAAkB;IAC9D;;OAEG;IACH,EAAE,EAAE,YAAY,CAAA;IAEhB;;;OAGG;IACH,KAAK,CAAC,EAAE,MAAM,CAAA;CACf;AAUD;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,qBAAa,aAAc,SAAQ,WAAW,CAAC,oBAAoB,CAAC;IAClE,EAAE,EAAE,YAAY,CAAA;IAChB,KAAK,EAAE,MAAM,CAAA;IACb,QAAQ,EAAE,YAAY,CAAC,MAAM,YAAY,CAAC,CAAA;IAC1C,QAAQ,EAAE,MAAM,CAAA;gBAEJ,OAAO,EAAE,oBAAoB;IAqBzC;;;;;OAKG;IACY,IAAI,CAAC,EAClB,WAAW,EACX,UAAU,EACV,MAAM,GACP,EAAE,QAAQ,GAAG,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC;IA6F7B,OAAO,CAAC,EAAE,GAAG,EAAE,KAAK,EAAE,SAAS,EAAE,EAAE,cAAc,CAAC,SAAS,CAAC;IAoB5D,KAAK,CAAC,EAAE,GAAG,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,YAAY,CAAC,SAAS,CAAC;IAiBpD,OAAO,CAAC,EAAE,GAAG,EAAE,SAAS,EAAE,EAAE,cAAc,CAAC,SAAS,CAAC;IAYrD,QAAQ,CAAC,EACtB,IAAI,EACJ,IAAI,EACJ,IAAI,EACJ,KAAK,EACL,IAAI,EACJ,KAAK,EACL,QAAQ,GACT,EAAE,eAAe;IAYH,KAAK;CAGrB"}
+{"version":3,"file":"PrismaAdapter.d.ts","sourceRoot":"","sources":["../../../src/adapters/PrismaAdapter/PrismaAdapter.ts"],"names":[],"mappings":"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"}

package/dist/adapters/PrismaAdapter/PrismaAdapter.js

@@ -25,6 +25,27 @@ var import_change_case = require("change-case");
 var import_consts = require("../../consts.js");
 var import_BaseAdapter = require("../BaseAdapter/BaseAdapter.js");
 var import_errors = require("./errors.js");
+function isPrismaAdapterDelegate(value) {
+  const candidate = value;
+  return candidate !== null && typeof candidate === "object" && typeof candidate.findFirst === "function" && typeof candidate.updateMany === "function" && typeof candidate.delete === "function" && typeof candidate.update === "function" && typeof candidate.create === "function" && typeof candidate.deleteMany === "function";
+}
+function getDelegate(db, model) {
+  const delegate = db[model];
+  if (!isPrismaAdapterDelegate(delegate)) {
+    throw new import_errors.ModelNameError(model);
+  }
+  return delegate;
+}
+function getActiveProvider(db) {
+  const provider = db._activeProvider;
+  if (typeof provider !== "string") {
+    console.warn(
+      "[CedarJS Jobs] Could not determine Prisma active provider from db._activeProvider. Provider-specific behaviour may not work correctly."
+    );
+    return "";
+  }
+  return provider;
+}
 class PrismaAdapter extends import_BaseAdapter.BaseAdapter {
   db;
   model;
@@ -34,11 +55,9 @@ class PrismaAdapter extends import_BaseAdapter.BaseAdapter {
     super(options);
     this.db = options.db;
     this.model = options.model || import_consts.DEFAULT_MODEL_NAME;
-    this.accessor = this.db[(0, import_change_case.camelCase)(this.model)];
-    this.provider = options.db._activeProvider;
-    if (!this.accessor) {
-      throw new import_errors.ModelNameError(this.model);
-    }
+    const camelName = (0, import_change_case.camelCase)(String(this.model));
+    this.accessor = getDelegate(this.db, camelName);
+    this.provider = getActiveProvider(options.db);
   }
   /**
    * Finds the next job to run, locking it so that no other process can pick it

package/dist/consts.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"consts.d.ts","sourceRoot":"","sources":["../src/consts.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,oBAAoB,KAAK,CAAA;AACtC,yBAAyB;AACzB,eAAO,MAAM,mBAAmB,QAAS,CAAA;AACzC,gBAAgB;AAChB,eAAO,MAAM,mBAAmB,IAAI,CAAA;AAEpC,eAAO,MAAM,8BAA8B,OAAO,CAAA;AAClD,eAAO,MAAM,0BAA0B,QAAQ,CAAA;AAC/C,eAAO,MAAM,cAAc,SAAU,CAAA;AACrC,eAAO,MAAM,aAAa,YAAY,CAAA;AACtC,eAAO,MAAM,kBAAkB,MAAM,CAAA;AACrC,eAAO,MAAM,gBAAgB,KAAK,CAAA;AAClC,eAAO,MAAM,YAAY,IAAI,CAAA;AAC7B,eAAO,MAAM,kBAAkB,MAAO,CAAA;AACtC,eAAO,MAAM,oBAAoB,mBAAmB,CAAA;AACpD,eAAO,MAAM,kBAAkB,kBAAkB,CAAA;AAEjD;;;GAGG;AACH,eAAO,MAAM,oBAAoB,YAAY,CAAA;AAC7C;;;GAGG;AACH,eAAO,MAAM,mBAAmB,WAAW,CAAA"}
+{"version":3,"file":"consts.d.ts","sourceRoot":"","sources":["../src/consts.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,oBAAoB,KAAK,CAAA;AACtC,yBAAyB;AACzB,eAAO,MAAM,mBAAmB,QAAS,CAAA;AACzC,gBAAgB;AAChB,eAAO,MAAM,mBAAmB,IAAI,CAAA;AAEpC,eAAO,MAAM,8BAA8B,OAAO,CAAA;AAClD,eAAO,MAAM,0BAA0B,QAAQ,CAAA;AAC/C,eAAO,MAAM,cAAc,SAAU,CAAA;AACrC,eAAO,MAAM,aAAa,YAAY,CAAA;AACtC,eAAO,MAAM,kBAAkB,MAAM,CAAA;AACrC,eAAO,MAAM,gBAAgB,KAAK,CAAA;AAClC,eAAO,MAAM,YAAY,IAAI,CAAA;AAC7B,eAAO,MAAM,kBAAkB,MAAO,CAAA;AACtC,eAAO,MAAM,oBAAoB,mBAAmB,CAAA;AAEpD,eAAO,MAAM,kBAAkB,kBAAkB,CAAA;AAEjD;;;GAGG;AACH,eAAO,MAAM,oBAAoB,YAAY,CAAA;AAC7C;;;GAGG;AACH,eAAO,MAAM,mBAAmB,WAAW,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/jobs",
-  "version": "2.6.0",
+  "version": "2.6.1-next.104+6be0fa58d",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/cedarjs/cedar.git",
@@ -38,13 +38,13 @@
     "test:watch": "vitest"
   },
   "dependencies": {
-    "@cedarjs/cli-helpers": "2.6.0",
-    "@cedarjs/project-config": "2.6.0",
+    "@cedarjs/cli-helpers": "2.6.1-next.104+6be0fa58d",
+    "@cedarjs/project-config": "2.6.1-next.104+6be0fa58d",
     "cron-parser": "5.5.0",
-    "type-fest": "5.4.3"
+    "type-fest": "5.4.4"
   },
   "devDependencies": {
-    "@cedarjs/framework-tools": "0.0.0",
+    "@cedarjs/framework-tools": "2.6.1-next.104",
     "@prisma/client": "6.19.2",
     "concurrently": "9.2.1",
     "publint": "0.3.17",
@@ -55,5 +55,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "2e238d88be71ec4ec6b9f329bf9c0fc7f2a069fd"
+  "gitHead": "6be0fa58d21ad717026065445aab7117e39ee3eb"
 }