@vercel/fs-detectors 5.8.18 → 5.9.0

package/dist/services/detect-services.js

@@ -145,7 +145,6 @@ function generateServicesRoutes(services) {
         });
       }
     } else {
-      continue;
     }
   }
   const workerServices = services.filter((s) => s.type === "worker");
@@ -165,7 +164,11 @@ function generateServicesRoutes(services) {
   const cronServices = services.filter((s) => s.type === "cron");
   for (const service of cronServices) {
     const cronEntrypoint = service.entrypoint || service.builder.src || "index";
-    const cronPath = (0, import_utils.getInternalServiceCronPath)(service.name, cronEntrypoint);
+    const cronPath = (0, import_utils.getInternalServiceCronPath)(
+      service.name,
+      cronEntrypoint,
+      service.handlerFunction || "cron"
+    );
     const functionPath = (0, import_utils.getInternalServiceFunctionPath)(service.name);
     crons.push({
       src: `^${escapeRegex(cronPath)}$`,

package/dist/services/resolve.js

@@ -41,6 +41,16 @@ var import_frameworks = __toESM(require("@vercel/frameworks"));
 var import_detect_framework = require("../detect-framework");
 var import_routing_utils = require("@vercel/routing-utils");
 const frameworksBySlug = new Map(import_frameworks.default.map((f) => [f.slug, f]));
+const PYTHON_MODULE_ATTR_RE = /^([A-Za-z_][\w]*(?:\.[A-Za-z_][\w]*)*):([A-Za-z_][\w]*)$/;
+function parsePyModuleAttrEntrypoint(entrypoint) {
+  const match = PYTHON_MODULE_ATTR_RE.exec(entrypoint);
+  if (!match)
+    return null;
+  return {
+    attrName: match[2],
+    filePath: match[1].replace(/\./g, "/") + ".py"
+  };
+}
 const SERVICE_NAME_REGEX = /^[a-zA-Z]([a-zA-Z0-9_-]*[a-zA-Z0-9])?$/;
 function normalizeServiceEntrypoint(entrypoint) {
   const normalized = import_path.posix.normalize(entrypoint);
@@ -245,7 +255,9 @@ function validateServiceConfig(name, config) {
 }
 function validateServiceEntrypoint(name, config, resolvedEntrypoint) {
   if (!resolvedEntrypoint.isDirectory && !config.builder && !config.runtime && !config.framework) {
-    const runtime = (0, import_utils.inferServiceRuntime)({ entrypoint: config.entrypoint });
+    const runtime = (0, import_utils.inferServiceRuntime)({
+      entrypoint: resolvedEntrypoint.normalized
+    });
     if (!runtime) {
       const supported = Object.keys(import_types.ENTRYPOINT_EXTENSIONS).join(", ");
       return {
@@ -268,12 +280,14 @@ async function resolveConfiguredService(options) {
   } = options;
   const type = config.type || "web";
   const rawEntrypoint = config.entrypoint;
+  const moduleAttrParsed = typeof rawEntrypoint === "string" && type === "cron" ? parsePyModuleAttrEntrypoint(rawEntrypoint) : null;
   let resolvedEntrypointPath = resolvedEntrypoint;
   if (!resolvedEntrypointPath && typeof rawEntrypoint === "string") {
+    const entrypointToResolve = moduleAttrParsed ? moduleAttrParsed.filePath : rawEntrypoint;
     const resolved = await resolveEntrypointPath({
       fs,
       serviceName: name,
-      entrypoint: rawEntrypoint
+      entrypoint: entrypointToResolve
     });
     resolvedEntrypointPath = resolved.entrypoint;
   }
@@ -349,6 +363,9 @@ async function resolveConfiguredService(options) {
   if (config.framework) {
     builderConfig.framework = config.framework;
   }
+  if (moduleAttrParsed) {
+    builderConfig.handlerFunction = moduleAttrParsed.attrName;
+  }
   return {
     name,
     type,
@@ -367,6 +384,7 @@ async function resolveConfiguredService(options) {
     buildCommand: config.buildCommand,
     installCommand: config.installCommand,
     schedule: config.schedule,
+    handlerFunction: moduleAttrParsed?.attrName,
     topic,
     consumer
   };
@@ -383,11 +401,14 @@ async function resolveAllConfiguredServices(services, fs, routePrefixSource = "c
       continue;
     }
     let resolvedEntrypoint;
+    const serviceType = serviceConfig.type || "web";
     if (typeof serviceConfig.entrypoint === "string") {
+      const moduleAttr = serviceType === "cron" ? parsePyModuleAttrEntrypoint(serviceConfig.entrypoint) : null;
+      const entrypointToResolve = moduleAttr ? moduleAttr.filePath : serviceConfig.entrypoint;
       const resolvedPath = await resolveEntrypointPath({
         fs,
         serviceName: name,
-        entrypoint: serviceConfig.entrypoint
+        entrypoint: entrypointToResolve
       });
       if (resolvedPath.error) {
         errors.push(resolvedPath.error);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/fs-detectors",
-  "version": "5.8.18",
+  "version": "5.9.0",
   "description": "Vercel filesystem detectors",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -19,9 +19,9 @@
     "json5": "2.2.2",
     "minimatch": "3.1.2",
     "semver": "6.3.1",
+    "@vercel/frameworks": "3.20.0",
     "@vercel/error-utils": "2.0.3",
-    "@vercel/routing-utils": "6.0.2",
-    "@vercel/frameworks": "3.20.0"
+    "@vercel/routing-utils": "6.0.2"
   },
   "devDependencies": {
     "@types/glob": "7.2.0",
@@ -32,7 +32,7 @@
     "@types/semver": "7.3.10",
     "jest-junit": "16.0.0",
     "typescript": "4.9.5",
-    "@vercel/build-utils": "13.6.3"
+    "@vercel/build-utils": "13.7.0"
   },
   "scripts": {
     "build": "node ../../utils/build.mjs",