@vercel/fs-detectors 5.8.16 → 5.8.18

package/dist/index.d.ts

@@ -2,7 +2,7 @@ export { detectBuilders, detectOutputDirectory, detectApiDirectory, detectApiExt
 export { detectServices, generateServicesRoutes, } from './services/detect-services';
 export { autoDetectServices } from './services/auto-detect';
 export type { AutoDetectOptions, AutoDetectResult, } from './services/auto-detect';
-export { isStaticBuild, isRouteOwningBuilder, INTERNAL_SERVICE_PREFIX, getInternalServiceFunctionPath, } from './services/utils';
+export { isStaticBuild, isRouteOwningBuilder, INTERNAL_SERVICE_PREFIX, getInternalServiceFunctionPath, getInternalServiceCronPath, getInternalServiceCronPathPrefix, getInternalServiceWorkerPath, getInternalServiceWorkerPathPrefix, } from './services/utils';
 export { getServicesBuilders } from './services/get-services-builders';
 export type { DetectServicesOptions, DetectServicesResult, DetectServicesSource, ResolvedService, Service, ServicesRoutes, ServiceDetectionError, } from './services/types';
 export { detectFileSystemAPI } from './detect-file-system-api';

package/dist/index.js

@@ -40,7 +40,11 @@ __export(src_exports, {
   detectOutputDirectory: () => import_detect_builders.detectOutputDirectory,
   detectServices: () => import_detect_services.detectServices,
   generateServicesRoutes: () => import_detect_services.generateServicesRoutes,
+  getInternalServiceCronPath: () => import_utils.getInternalServiceCronPath,
+  getInternalServiceCronPathPrefix: () => import_utils.getInternalServiceCronPathPrefix,
   getInternalServiceFunctionPath: () => import_utils.getInternalServiceFunctionPath,
+  getInternalServiceWorkerPath: () => import_utils.getInternalServiceWorkerPath,
+  getInternalServiceWorkerPathPrefix: () => import_utils.getInternalServiceWorkerPathPrefix,
   getProjectPaths: () => import_get_project_paths.getProjectPaths,
   getServicesBuilders: () => import_get_services_builders.getServicesBuilders,
   getWorkspacePackagePaths: () => import_get_workspace_package_paths.getWorkspacePackagePaths,
@@ -96,7 +100,11 @@ var import_detect_instrumentation = require("./detect-instrumentation");
   detectOutputDirectory,
   detectServices,
   generateServicesRoutes,
+  getInternalServiceCronPath,
+  getInternalServiceCronPathPrefix,
   getInternalServiceFunctionPath,
+  getInternalServiceWorkerPath,
+  getInternalServiceWorkerPathPrefix,
   getProjectPaths,
   getServicesBuilders,
   getWorkspacePackagePaths,

package/dist/services/auto-detect.js

@@ -112,6 +112,9 @@ async function detectServicesAtRoot(fs, rootFramework) {
   if (backendResult.error) {
     return { services: null, errors: [backendResult.error] };
   }
+  if (Object.keys(backendResult.services).length === 0) {
+    return { services: null, errors: [] };
+  }
   Object.assign(services, backendResult.services);
   return { services, errors: [] };
 }

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

@@ -26,6 +26,12 @@ 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.
  *
- * - Cron/Worker services: TODO - internal routes under `/_svc/`
+ * - Worker services:
+ *   Internal queue callback routes under `/_svc/{serviceName}/workers/{entry}/{handler}`
+ *   that rewrite to `/_svc/{serviceName}/index`.
+ *
+ * - Cron services:
+ *   Internal cron callback routes under `/_svc/{serviceName}/crons/{entry}/{handler}`
+ *   that rewrite to `/_svc/{serviceName}/index`.
  */
 export declare function generateServicesRoutes(services: ResolvedService[]): ServicesRoutes;

package/dist/services/detect-services.js

@@ -148,8 +148,36 @@ function generateServicesRoutes(services) {
       continue;
     }
   }
+  const workerServices = services.filter((s) => s.type === "worker");
+  for (const service of workerServices) {
+    const workerEntrypoint = service.entrypoint || service.builder.src || "index";
+    const workerPath = (0, import_utils.getInternalServiceWorkerPath)(
+      service.name,
+      workerEntrypoint
+    );
+    const functionPath = (0, import_utils.getInternalServiceFunctionPath)(service.name);
+    workers.push({
+      src: `^${escapeRegex(workerPath)}$`,
+      dest: functionPath,
+      check: true
+    });
+  }
+  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 functionPath = (0, import_utils.getInternalServiceFunctionPath)(service.name);
+    crons.push({
+      src: `^${escapeRegex(cronPath)}$`,
+      dest: functionPath,
+      check: true
+    });
+  }
   return { rewrites, defaults, crons, workers };
 }
+function escapeRegex(str) {
+  return str.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}
 function getWebRoutePrefixes(services) {
   const unique = /* @__PURE__ */ new Set();
   for (const service of services) {

package/dist/services/get-services-builders.js

@@ -84,7 +84,11 @@ async function getServicesBuilders(options) {
     warnings: warningResponses,
     defaultRoutes: result.routes.defaults.length > 0 ? result.routes.defaults : null,
     redirectRoutes: [],
-    rewriteRoutes: result.routes.rewrites.length > 0 ? result.routes.rewrites : null,
+    rewriteRoutes: result.routes.rewrites.length > 0 || result.routes.workers.length > 0 || result.routes.crons.length > 0 ? [
+      ...result.routes.rewrites,
+      ...result.routes.workers,
+      ...result.routes.crons
+    ] : null,
     errorRoutes: [],
     services: result.services
   };

package/dist/services/types.d.ts

@@ -22,13 +22,11 @@ export interface ServicesRoutes {
     /**
      * Internal routes for cron services.
      * These route `/_svc/{serviceName}/crons/{entry}/{handler}` to the cron function.
-     * TODO: Implement
      */
     crons: Route[];
     /**
      * Internal routes for worker services.
      * These route `/_svc/{serviceName}/workers/{entry}/{handler}` to the worker function.
-     * TODO: Implement
      */
     workers: Route[];
 }

package/dist/services/utils.d.ts

@@ -6,6 +6,10 @@ export declare function hasFile(fs: DetectorFilesystem, filePath: string): Promi
  */
 export declare const INTERNAL_SERVICE_PREFIX = "/_svc";
 export declare function getInternalServiceFunctionPath(serviceName: string): string;
+export declare function getInternalServiceWorkerPathPrefix(serviceName: string): string;
+export declare function getInternalServiceCronPathPrefix(serviceName: string): string;
+export declare function getInternalServiceWorkerPath(serviceName: string, entrypoint: string, handler?: string): string;
+export declare function getInternalServiceCronPath(serviceName: string, entrypoint: string, handler?: string): string;
 export declare function getBuilderForRuntime(runtime: ServiceRuntime): string;
 export declare function isStaticBuild(service: ResolvedService): boolean;
 /**

package/dist/services/utils.js

@@ -21,7 +21,11 @@ __export(utils_exports, {
   INTERNAL_SERVICE_PREFIX: () => INTERNAL_SERVICE_PREFIX,
   filterFrameworksByRuntime: () => filterFrameworksByRuntime,
   getBuilderForRuntime: () => getBuilderForRuntime,
+  getInternalServiceCronPath: () => getInternalServiceCronPath,
+  getInternalServiceCronPathPrefix: () => getInternalServiceCronPathPrefix,
   getInternalServiceFunctionPath: () => getInternalServiceFunctionPath,
+  getInternalServiceWorkerPath: () => getInternalServiceWorkerPath,
+  getInternalServiceWorkerPathPrefix: () => getInternalServiceWorkerPathPrefix,
   hasFile: () => hasFile,
   inferRuntimeFromFramework: () => inferRuntimeFromFramework,
   inferServiceRuntime: () => inferServiceRuntime,
@@ -43,6 +47,24 @@ const INTERNAL_SERVICE_PREFIX = "/_svc";
 function getInternalServiceFunctionPath(serviceName) {
   return `${INTERNAL_SERVICE_PREFIX}/${serviceName}/index`;
 }
+function normalizeInternalServiceEntrypoint(entrypoint) {
+  const normalized = entrypoint.replace(/\\/g, "/").replace(/^\/+/, "").replace(/\.[^/.]+$/, "");
+  return normalized || "index";
+}
+function getInternalServiceWorkerPathPrefix(serviceName) {
+  return `${INTERNAL_SERVICE_PREFIX}/${serviceName}/workers`;
+}
+function getInternalServiceCronPathPrefix(serviceName) {
+  return `${INTERNAL_SERVICE_PREFIX}/${serviceName}/crons`;
+}
+function getInternalServiceWorkerPath(serviceName, entrypoint, handler = "worker") {
+  const normalizedEntrypoint = normalizeInternalServiceEntrypoint(entrypoint);
+  return `${getInternalServiceWorkerPathPrefix(serviceName)}/${normalizedEntrypoint}/${handler}`;
+}
+function getInternalServiceCronPath(serviceName, entrypoint, handler = "cron") {
+  const normalizedEntrypoint = normalizeInternalServiceEntrypoint(entrypoint);
+  return `${getInternalServiceCronPathPrefix(serviceName)}/${normalizedEntrypoint}/${handler}`;
+}
 function getBuilderForRuntime(runtime) {
   const builder = import_types.RUNTIME_BUILDERS[runtime];
   if (!builder) {
@@ -127,7 +149,11 @@ async function readVercelConfig(fs) {
   INTERNAL_SERVICE_PREFIX,
   filterFrameworksByRuntime,
   getBuilderForRuntime,
+  getInternalServiceCronPath,
+  getInternalServiceCronPathPrefix,
   getInternalServiceFunctionPath,
+  getInternalServiceWorkerPath,
+  getInternalServiceWorkerPathPrefix,
   hasFile,
   inferRuntimeFromFramework,
   inferServiceRuntime,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/fs-detectors",
-  "version": "5.8.16",
+  "version": "5.8.18",
   "description": "Vercel filesystem detectors",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -20,8 +20,8 @@
     "minimatch": "3.1.2",
     "semver": "6.3.1",
     "@vercel/error-utils": "2.0.3",
-    "@vercel/frameworks": "3.20.0",
-    "@vercel/routing-utils": "6.0.2"
+    "@vercel/routing-utils": "6.0.2",
+    "@vercel/frameworks": "3.20.0"
   },
   "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.2"
+    "@vercel/build-utils": "13.6.3"
   },
   "scripts": {
     "build": "node ../../utils/build.mjs",