@beignet/cli 0.0.43 → 0.0.45

package/src/inspect.ts

@@ -2347,6 +2347,10 @@ async function inspectProductionReadiness(
     packageJson,
   );
   const configFiles = operationalConfigFiles(files, config);
+  const cronDirectory = path.posix.join(
+    directoryPath(config.paths.routes),
+    "cron",
+  );
   const infrastructurePath = directoryPath(
     path.dirname(config.paths.portWiring),
   );
@@ -2380,16 +2384,17 @@ async function inspectProductionReadiness(
     }
 
     if (
-      file.startsWith("app/api/cron/") &&
+      fileWithinDirectory(file, cronDirectory) &&
       file.endsWith("/route.ts") &&
       !/\bCRON_SECRET\b/.test(source) &&
-      !/\bcreateOutboxDrainRoute\s*\(/.test(source)
+      !/\bcreateOutboxDrainRoute\s*\(/.test(source) &&
+      !/\bcreateScheduleRoute\s*\(/.test(source)
     ) {
       diagnostics.push({
         severity: "warning",
         code: "BEIGNET_CRON_SECRET_MISSING",
         file,
-        message: `${file} looks like a cron route that does not reference CRON_SECRET. Protect cron entrypoints with a shared secret or a framework helper such as createOutboxDrainRoute(...).`,
+        message: `${file} looks like a cron route that does not reference CRON_SECRET. Protect cron entrypoints with a shared secret or a framework helper such as createOutboxDrainRoute(...) or createScheduleRoute(...).`,
       });
     }
 
@@ -3882,9 +3887,15 @@ function isInfraOrServerFile(
 }
 
 function containsCallExpression(source: string, name: string): boolean {
-  return new RegExp(
+  const codeIndexes = new Set(codeCharacterIndexes(source));
+  const pattern = new RegExp(
     `\\b${escapeRegExp(name)}\\s*(?:<[^;=(){}]*>\\s*)?\\(`,
-  ).test(source);
+    "g",
+  );
+
+  return [...source.matchAll(pattern)].some(
+    (match) => match.index !== undefined && codeIndexes.has(match.index),
+  );
 }
 
 type WorkflowRegistryKind =
@@ -4607,6 +4618,8 @@ async function inspectServerlessFootguns(
   convention: InspectConvention,
 ): Promise<InspectDiagnostic[]> {
   const diagnostics: InspectDiagnostic[] = [];
+  const routeDirectory = directoryPath(config.paths.routes);
+  const cronDirectory = path.posix.join(routeDirectory, "cron");
 
   for (const file of files) {
     if (
@@ -4617,12 +4630,9 @@ async function inspectServerlessFootguns(
       continue;
     }
 
-    const isInfraOrServerFile =
-      file.startsWith("infra/") || file.startsWith("server/");
-    const isProviderFile =
-      /(^|\/)provider(s)?\.ts$/.test(file) ||
-      /(^|\/)[^/]*provider[^/]*\.ts$/.test(file);
     const source = await readFile(path.join(targetDir, file), "utf8");
+    const isInfraOrServerFile = isRuntimeFile(file, config);
+    const isProviderFile = isProviderLifecycleFile(file, source);
 
     if (
       config.framework === "next" &&
@@ -4666,7 +4676,7 @@ async function inspectServerlessFootguns(
     }
 
     if (
-      file.startsWith("app/api/cron/") &&
+      fileWithinDirectory(file, cronDirectory) &&
       file.endsWith("/route.ts") &&
       !/\bauthorization\b/i.test(source) &&
       !/\bcreateOutboxDrainRoute\s*\(/.test(source) &&
@@ -4682,8 +4692,8 @@ async function inspectServerlessFootguns(
   }
 
   if (
-    hasOutboxRegistry(files) &&
-    !(await appHasOutboxDrainEntrypoint(targetDir, files))
+    hasOutboxRegistry(files, config) &&
+    !(await appHasOutboxDrainEntrypoint(targetDir, files, config))
   ) {
     diagnostics.push({
       severity: "warning",
@@ -4696,6 +4706,82 @@ async function inspectServerlessFootguns(
   return diagnostics;
 }
 
+function configuredRuntimeFiles(config: ResolvedBeignetConfig): string[] {
+  return [
+    config.paths.server,
+    config.paths.listeners,
+    config.paths.tasks,
+    config.paths.outbox,
+    config.paths.schedules,
+    config.paths.portWiring,
+  ];
+}
+
+function configuredRuntimeDirectories(config: ResolvedBeignetConfig): string[] {
+  const applicationDirectories = configuredApplicationDirectories(config);
+
+  return configuredRuntimeFiles(config)
+    .map((file) => directoryPath(path.posix.dirname(file)))
+    .filter((directory) => directory !== ".")
+    .filter(
+      (directory) =>
+        !applicationDirectories.some(
+          (applicationDirectory) =>
+            applicationDirectory !== directory &&
+            fileWithinDirectory(applicationDirectory, directory),
+        ),
+    )
+    .filter((directory, index, all) => all.indexOf(directory) === index);
+}
+
+function configuredApplicationDirectories(
+  config: ResolvedBeignetConfig,
+): string[] {
+  return [
+    config.paths.contracts,
+    config.paths.routes,
+    config.paths.features,
+    config.paths.policies,
+    config.paths.useCases,
+    config.paths.tests,
+  ]
+    .map(directoryPath)
+    .filter((directory) => directory !== ".")
+    .filter((directory, index, all) => all.indexOf(directory) === index);
+}
+
+function isRuntimeFile(file: string, config: ResolvedBeignetConfig): boolean {
+  if (configuredRuntimeFiles(config).includes(file)) return true;
+  if (
+    configuredApplicationDirectories(config).some((directory) =>
+      fileWithinDirectory(file, directory),
+    )
+  ) {
+    return false;
+  }
+
+  return (
+    fileWithinDirectory(file, "infra") ||
+    fileWithinDirectory(file, "server") ||
+    configuredRuntimeDirectories(config).some((directory) =>
+      fileWithinDirectory(file, directory),
+    )
+  );
+}
+
+function fileWithinDirectory(file: string, directory: string): boolean {
+  return directory === "." || file.startsWith(`${directory}/`);
+}
+
+function isProviderLifecycleFile(file: string, source?: string): boolean {
+  return (
+    /(^|\/)provider(s)?\.ts$/.test(file) ||
+    /(^|\/)[^/]*provider[^/]*\.ts$/.test(file) ||
+    /(^|\/)providers?\//.test(file) ||
+    (source !== undefined && containsCallExpression(source, "createProvider"))
+  );
+}
+
 function isNextRouteFile(file: string, config: ResolvedBeignetConfig): boolean {
   const routesPath = directoryPath(config.paths.routes);
 
@@ -4727,33 +4813,35 @@ function importsEagerServer(
   return false;
 }
 
-function hasOutboxRegistry(files: string[]): boolean {
-  return files.some(isOutboxRegistryFile);
-}
-
-function isOutboxRegistryFile(file: string): boolean {
-  return file === "server/outbox.ts";
+function hasOutboxRegistry(
+  files: string[],
+  config: ResolvedBeignetConfig,
+): boolean {
+  return files.includes(config.paths.outbox);
 }
 
 async function appHasOutboxDrainEntrypoint(
   targetDir: string,
   files: string[],
+  config: ResolvedBeignetConfig,
 ): Promise<boolean> {
+  const routesDirectory = directoryPath(config.paths.routes);
+
   for (const file of files) {
     if (!file.endsWith(".ts") || file.endsWith(".test.ts")) continue;
     if (
-      !file.startsWith("app/api/") &&
-      !file.startsWith("server/") &&
-      !file.startsWith("infra/")
+      !fileWithinDirectory(file, routesDirectory) &&
+      !isRuntimeFile(file, config)
     ) {
       continue;
     }
 
     const source = await readFile(path.join(targetDir, file), "utf8");
-    if (
-      /\bcreateOutboxDrainRoute\s*\(/.test(source) ||
-      /\bdrainOutbox\s*\(/.test(source)
-    ) {
+    if (containsCallExpression(source, "createOutboxDrainRoute")) {
+      return true;
+    }
+    if (isProviderLifecycleFile(file, source)) continue;
+    if (containsCallExpression(source, "drainOutbox")) {
       return true;
     }
   }

package/src/lib.ts

@@ -103,7 +103,33 @@ export {
   makeUpload,
   makeUseCase,
 } from "./make.js";
-export { runOutboxDrain } from "./outbox.js";
+export type {
+  RunOutboxDrainOptions,
+  RunOutboxDrainResult,
+  RunOutboxListOptions,
+  RunOutboxListResult,
+  RunOutboxPruneOptions,
+  RunOutboxPruneResult,
+  RunOutboxPurgeOptions,
+  RunOutboxPurgeResult,
+  RunOutboxRequeueOptions,
+  RunOutboxRequeueResult,
+  RunOutboxShowOptions,
+  RunOutboxShowResult,
+} from "./outbox.js";
+export {
+  runOutboxDrain,
+  runOutboxList,
+  runOutboxPrune,
+  runOutboxPurge,
+  runOutboxRequeue,
+  runOutboxShow,
+} from "./outbox.js";
+export type {
+  RunAppScheduleOptions,
+  RunAppScheduleResult,
+} from "./schedule.js";
 export { runAppSchedule } from "./schedule.js";
+export type { RunAppTaskOptions, RunAppTaskResult } from "./task.js";
 export { runAppTask } from "./task.js";
 export type { StarterProviderName } from "./templates/index.js";