@vercel/fs-detectors 5.18.0 → 5.18.3

package/dist/services/detect-railway.js

@@ -80,7 +80,8 @@ async function detectRailwayServices(options) {
       const schedule = cf.config.deploy.cronSchedule;
       const runtime = frameworks.length === 1 ? (0, import_utils.inferRuntimeFromFramework)(frameworks[0].slug) : void 0;
       const hint = {
-        type: "cron",
+        type: "job",
+        trigger: "schedule",
         schedule,
         entrypoint: "<path-to-handler>"
       };
@@ -89,7 +90,7 @@ async function detectRailwayServices(options) {
       }
       warnings.push({
         code: "RAILWAY_CRON_HINT",
-        message: `Found Railway cron in ${dirLabel}/ (schedule: "${schedule}"). Vercel crons work with a file entrypoint. You can add the following to define this cron service:
+        message: `Found Railway cron in ${dirLabel}/ (schedule: "${schedule}"). Vercel crons work with a file entrypoint. You can add the following to define this scheduled job service:
 "${deriveServiceName(cf.dirPath)}": ${JSON.stringify(hint, null, 2)}`
       });
       continue;

package/dist/services/detect-services.d.ts

@@ -26,11 +26,11 @@ export declare function detectServices(options: DetectServicesOptions): Promise<
  * Builders that provide their own routing (`@vercel/next`, `@vercel/backends`,
  * Build Output API builders, etc.) are not given synthetic routes here.
  *
- * - Worker services:
+ * - Worker and queue-triggered job services:
  *   Internal queue callback routes under `/_svc/{serviceName}/workers/{entry}/{handler}`
  *   that rewrite to `/_svc/{serviceName}/index`.
  *
- * - Cron services:
+ * - Schedule-triggered job services:
  *   Internal cron callback routes under `/_svc/{serviceName}/crons/{entry}/{handler}`
  *   that rewrite to `/_svc/{serviceName}/index`.
  */

package/dist/services/detect-services.js

@@ -22,6 +22,7 @@ __export(detect_services_exports, {
   generateServicesRoutes: () => generateServicesRoutes
 });
 module.exports = __toCommonJS(detect_services_exports);
+var import_build_utils = require("@vercel/build-utils");
 var import_routing_utils = require("@vercel/routing-utils");
 var import_utils = require("./utils");
 var import_resolve = require("./resolve");
@@ -255,7 +256,7 @@ function generateServicesRoutes(services) {
       }
     }
   }
-  const workerServices = services.filter((s) => s.type === "worker");
+  const workerServices = services.filter(import_build_utils.isQueueTriggeredService);
   for (const service of workerServices) {
     const workerEntrypoint = service.entrypoint || service.builder.src || "index";
     const workerPath = (0, import_utils.getInternalServiceWorkerPath)(
@@ -269,7 +270,7 @@ function generateServicesRoutes(services) {
       check: true
     });
   }
-  const cronServices = services.filter((s) => s.type === "cron");
+  const cronServices = services.filter(import_build_utils.isScheduleTriggeredService);
   for (const service of cronServices) {
     const cronPrefix = (0, import_utils.getInternalServiceCronPathPrefix)(service.name);
     const functionPath = (0, import_utils.getInternalServiceFunctionPath)(service.name);

package/dist/services/resolve.js

@@ -281,6 +281,12 @@ function validateServiceConfig(name, config) {
     };
   }
   const serviceType = config.type || "web";
+  const isJobService = serviceType === "job" || serviceType === "cron";
+  const isScheduleJobService = serviceType === "cron" || serviceType === "job" && config.trigger === "schedule";
+  const isQueueJobService = serviceType === "job" && config.trigger === "queue";
+  const isWorkflowService = serviceType === "job" && config.trigger === "workflow";
+  const isNonWebService = serviceType === "worker" || isJobService;
+  const serviceTypeLabel = isJobService ? "Job" : serviceType === "worker" ? "Worker" : "Web";
   const routingResult = resolveServiceRoutingConfig(name, config);
   if (routingResult.error) {
     return routingResult.error;
@@ -310,24 +316,52 @@ function validateServiceConfig(name, config) {
       serviceName: name
     };
   }
-  if ((serviceType === "worker" || serviceType === "cron") && configuredRoutePrefix) {
+  if (isNonWebService && configuredRoutePrefix) {
     return {
       code: "INVALID_ROUTE_PREFIX",
-      message: `${serviceType === "worker" ? "Worker" : "Cron"} service "${name}" cannot have "routePrefix" or "mount". Only web services should specify path-based routing.`,
+      message: `${serviceTypeLabel} service "${name}" cannot have "routePrefix" or "mount". Only web services should specify path-based routing.`,
       serviceName: name
     };
   }
-  if ((serviceType === "worker" || serviceType === "cron") && hasSubdomain) {
+  if (isNonWebService && hasSubdomain) {
     return {
       code: "INVALID_HOST_ROUTING_CONFIG",
-      message: `${serviceType === "worker" ? "Worker" : "Cron"} service "${name}" cannot have "subdomain" or "mount.subdomain". Only web services should specify subdomain routing.`,
+      message: `${serviceTypeLabel} service "${name}" cannot have "subdomain" or "mount.subdomain". Only web services should specify subdomain routing.`,
       serviceName: name
     };
   }
-  if (serviceType === "cron" && !config.schedule) {
+  if (serviceType === "job" && config.trigger === void 0) {
     return {
-      code: "MISSING_CRON_SCHEDULE",
-      message: `Cron service "${name}" is missing required "schedule" field.`,
+      code: "MISSING_JOB_TRIGGER",
+      message: `Job service "${name}" is missing required "trigger" field.`,
+      serviceName: name
+    };
+  }
+  if (serviceType === "job" && config.trigger && !import_build_utils.JOB_TRIGGERS.includes(config.trigger)) {
+    return {
+      code: "INVALID_JOB_TRIGGER",
+      message: `Job service "${name}" has invalid trigger "${config.trigger}". Expected ${import_build_utils.JOB_TRIGGERS.map((t) => `"${t}"`).join(", ")}.`,
+      serviceName: name
+    };
+  }
+  if (isScheduleJobService && !config.schedule) {
+    return {
+      code: serviceType === "cron" ? "MISSING_CRON_SCHEDULE" : "MISSING_JOB_SCHEDULE",
+      message: `${serviceTypeLabel} service "${name}" is missing required "schedule" field.`,
+      serviceName: name
+    };
+  }
+  if (isQueueJobService && (!Array.isArray(config.topics) || config.topics.length === 0)) {
+    return {
+      code: "MISSING_QUEUE_TOPICS",
+      message: `${serviceTypeLabel} service "${name}" is missing required "topics" field.`,
+      serviceName: name
+    };
+  }
+  if (isWorkflowService && typeof config.entrypoint !== "string") {
+    return {
+      code: "MISSING_ENTRYPOINT",
+      message: `Job service "${name}" with "workflow" trigger must specify "entrypoint".`,
       serviceName: name
     };
   }
@@ -428,6 +462,7 @@ async function resolveConfiguredService(options) {
     routePrefixSource = "configured"
   } = options;
   const type = config.type || "web";
+  const trigger = type === "cron" ? "schedule" : type === "job" ? config.trigger : void 0;
   const rawEntrypoint = config.entrypoint;
   const moduleAttrParsed = typeof rawEntrypoint === "string" ? parsePyModuleAttrEntrypoint(rawEntrypoint) : null;
   const routingResult = resolveServiceRoutingConfig(name, config);
@@ -484,7 +519,7 @@ async function resolveConfiguredService(options) {
       workspace = workspace === "." ? normalizedRoot : import_path.posix.join(normalizedRoot, workspace);
     }
   }
-  const topics = type === "worker" ? (0, import_build_utils.getWorkerTopics)(config) : config.topics;
+  const topics = type === "worker" ? (0, import_build_utils.getServiceQueueTopics)({ type, topics: config.topics }) : trigger === "queue" ? config.topics : void 0;
   const consumer = type === "worker" ? config.consumer || "default" : config.consumer;
   let builderUse;
   let builderSrc;
@@ -550,6 +585,7 @@ async function resolveConfiguredService(options) {
   return {
     name,
     type,
+    trigger,
     group,
     workspace,
     entrypoint: resolvedEntrypointFile,

package/dist/services/types.d.ts

@@ -22,8 +22,8 @@ export interface ServicesRoutes {
     /** Default routes (catch-all for root web service) */
     defaults: Route[];
     /**
-     * Internal routes for cron services.
-     * These route `/_svc/{serviceName}/crons/{entry}/{handler}` to the cron function.
+     * Internal routes for schedule-triggered job services.
+     * These route `/_svc/{serviceName}/crons/{entry}/{handler}` to the scheduled job function.
      */
     crons: Route[];
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/fs-detectors",
-  "version": "5.18.0",
+  "version": "5.18.3",
   "description": "Vercel filesystem detectors",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -20,10 +20,10 @@
     "minimatch": "3.1.2",
     "semver": "6.3.1",
     "smol-toml": "1.5.2",
-    "@vercel/error-utils": "2.0.3",
     "@vercel/frameworks": "3.24.1",
-    "@vercel/build-utils": "13.17.0",
-    "@vercel/routing-utils": "6.1.1"
+    "@vercel/routing-utils": "6.1.1",
+    "@vercel/build-utils": "13.18.0",
+    "@vercel/error-utils": "2.0.3"
   },
   "devDependencies": {
     "@types/glob": "7.2.0",