@beignet/cli 0.0.8 → 0.0.10

package/dist/templates/shared.js

@@ -16,11 +16,56 @@ export const externalVersions = {
     drizzleOrm: "^0.45.2",
     inngest: "^3.0.0",
     libsqlClient: "^0.14.0",
+    mysql2: "^3.12.0",
+    pg: "^8.13.0",
+    pglite: "^0.5.2",
     pino: "^9.7.0",
     resend: "^4.0.1",
+    typesPg: "^8.11.0",
     upstashRateLimit: "^2.0.0",
     upstashRedis: "^1.0.0",
 };
+const databaseDescriptors = {
+    sqlite: {
+        name: "sqlite",
+        subpath: "sqlite",
+        apiToken: "Sqlite",
+        databaseType: "DrizzleSqliteDatabase",
+        providerFactory: "createDrizzleSqliteProvider",
+        providerInstance: "drizzleSqliteProvider",
+        providerName: "drizzle-sqlite",
+        urlEnvVar: "SQLITE_DB_URL",
+        drizzleKitDialect: "sqlite",
+        betterAuthProvider: "sqlite",
+    },
+    postgres: {
+        name: "postgres",
+        subpath: "postgres",
+        apiToken: "Postgres",
+        databaseType: "DrizzlePostgresDatabase",
+        providerFactory: "createDrizzlePostgresProvider",
+        providerInstance: "drizzlePostgresProvider",
+        providerName: "drizzle-postgres",
+        urlEnvVar: "POSTGRES_DB_URL",
+        drizzleKitDialect: "postgresql",
+        betterAuthProvider: "pg",
+    },
+    mysql: {
+        name: "mysql",
+        subpath: "mysql",
+        apiToken: "Mysql",
+        databaseType: "DrizzleMysqlDatabase",
+        providerFactory: "createDrizzleMysqlProvider",
+        providerInstance: "drizzleMysqlProvider",
+        providerName: "drizzle-mysql",
+        urlEnvVar: "MYSQL_DB_URL",
+        drizzleKitDialect: "mysql",
+        betterAuthProvider: "mysql",
+    },
+};
+export function databaseDescriptor(ctx) {
+    return databaseDescriptors[ctx.database];
+}
 export function packageRunner(ctx) {
     switch (ctx.packageManager) {
         case "npm":

package/dist/templates/shared.js.map

@@ -1 +1 @@
-{"version":3,"file":"shared.js","sourceRoot":"","sources":["../../src/templates/shared.ts"],"names":[],"mappings":"AAwBA,MAAM,CAAC,MAAM,gBAAgB,GAAG;IAC9B,IAAI,EAAE,SAAS;IACf,KAAK,EAAE,SAAS;IAChB,QAAQ,EAAE,SAAS;IACnB,UAAU,EAAE,QAAQ;IACpB,QAAQ,EAAE,SAAS;IACnB,SAAS,EAAE,UAAU;IACrB,UAAU,EAAE,SAAS;IACrB,aAAa,EAAE,SAAS;IACxB,GAAG,EAAE,QAAQ;IACb,kBAAkB,EAAE,UAAU;IAC9B,iBAAiB,EAAE,QAAQ;IAC3B,aAAa,EAAE,SAAS;IACxB,UAAU,EAAE,QAAQ;IACpB,UAAU,EAAE,UAAU;IACtB,UAAU,EAAE,SAAS;IACrB,OAAO,EAAE,QAAQ;IACjB,YAAY,EAAE,SAAS;IACvB,IAAI,EAAE,QAAQ;IACd,MAAM,EAAE,QAAQ;IAChB,gBAAgB,EAAE,QAAQ;IAC1B,YAAY,EAAE,QAAQ;CACvB,CAAC;AAEF,MAAM,UAAU,aAAa,CAAC,GAAoB;IAChD,QAAQ,GAAG,CAAC,cAAc,EAAE,CAAC;QAC3B,KAAK,KAAK;YACR,OAAO,oBAAoB,CAAC;QAC9B,KAAK,MAAM;YACT,OAAO,cAAc,CAAC;QACxB,KAAK,MAAM;YACT,OAAO,cAAc,CAAC;QACxB;YACE,OAAO,aAAa,CAAC;IACzB,CAAC;AACH,CAAC;AAED,MAAM,CAAC,MAAM,eAAe,GAGxB;IACF,OAAO,EAAE;QACP,2BAA2B,EAAE,EAAE;QAC/B,OAAO,EAAE,gBAAgB,CAAC,OAAO;KAClC;IACD,MAAM,EAAE;QACN,+BAA+B,EAAE,EAAE;QACnC,MAAM,EAAE,gBAAgB,CAAC,MAAM;KAChC;IACD,oBAAoB,EAAE;QACpB,sCAAsC,EAAE,EAAE;QAC1C,oBAAoB,EAAE,gBAAgB,CAAC,gBAAgB;QACvD,gBAAgB,EAAE,gBAAgB,CAAC,YAAY;KAChD;CACF,CAAC;AAEF,MAAM,UAAU,cAAc,CAC5B,GAAoB,EACpB,WAA4B;IAE5B,OAAO,GAAG,CAAC,YAAY,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;AAChD,CAAC;AAED,MAAM,UAAU,IAAI,CAAC,KAAc;IACjC,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC;AAClD,CAAC"}
+{"version":3,"file":"shared.js","sourceRoot":"","sources":["../../src/templates/shared.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@beignet/cli",
-  "version": "0.0.8",
+  "version": "0.0.10",
   "type": "module",
   "description": "CLI for creating and maintaining Beignet apps.",
   "main": "./dist/lib.js",
@@ -66,7 +66,7 @@
     "typescript": "^5.3.0"
   },
   "dependencies": {
-    "@beignet/core": "^0.0.8",
+    "@beignet/core": "^0.0.10",
     "@clack/prompts": "^1.5.1",
     "@stricli/core": "^1.2.7",
     "jiti": "^2.7.0"

package/src/choices.ts

@@ -1,7 +1,8 @@
 /**
- * Choice lists and string-literal types shared by the CLI entrypoint and the
- * heavier scaffold/generator modules. Keeping them here lets the bin define
- * flag enums without loading templates or generators at startup.
+ * Choice lists, string-literal types, and small pure helpers shared by the
+ * CLI entrypoint and the heavier scaffold/generator modules. Keeping them
+ * here lets the bin define flag enums and next steps without loading
+ * templates or generators at startup.
  */
 
 /**
@@ -19,6 +20,10 @@ export type TemplateName = "next";
  * integrations that add an external service remain selectable.
  */
 export type IntegrationName = "inngest" | "resend" | "upstash-rate-limit";
+/**
+ * Databases supported by the starter's Drizzle persistence layer.
+ */
+export type DatabaseName = "sqlite" | "postgres" | "mysql";
 
 /**
  * Supported scaffold template choices.
@@ -46,6 +51,68 @@ export const integrationChoices = [
   "upstash-rate-limit",
 ] as const satisfies readonly IntegrationName[];
 
+/**
+ * Supported scaffold database choices.
+ */
+export const databaseChoices = [
+  "sqlite",
+  "postgres",
+  "mysql",
+] as const satisfies readonly DatabaseName[];
+
+/**
+ * Local database name derived from the app name.
+ *
+ * Postgres and MySQL database identifiers are stricter than project names,
+ * so dashes and dots become underscores. Used by `.env.example`, the
+ * generated drizzle config, and the create command's next steps, which must
+ * all point at the same local database.
+ */
+export function databaseLocalName(appName: string): string {
+  return appName.replaceAll(/[^a-z0-9_]/g, "_");
+}
+
+/**
+ * Docker one-liner that starts a local database matching the generated
+ * `.env.example` connection URL. Returns undefined for SQLite, which needs
+ * no server.
+ */
+export function databaseStartCommand(
+  database: DatabaseName,
+  appName: string,
+): string | undefined {
+  const databaseName = databaseLocalName(appName);
+
+  switch (database) {
+    case "postgres":
+      return `docker run --rm -d -e POSTGRES_USER=beignet -e POSTGRES_PASSWORD=beignet -e POSTGRES_DB=${databaseName} -p 5432:5432 postgres:17-alpine`;
+    case "mysql":
+      return `docker run --rm -d -e MYSQL_ROOT_PASSWORD=beignet -e MYSQL_DATABASE=${databaseName} -p 3306:3306 mysql:8.4`;
+    default:
+      return undefined;
+  }
+}
+
+/**
+ * Local development connection URL matching `databaseStartCommand`.
+ * Used as the `.env.example` value and the generated env defaults.
+ */
+export function databaseLocalUrl(
+  database: DatabaseName,
+  appName: string,
+): string {
+  const databaseName = databaseLocalName(appName);
+
+  switch (database) {
+    case "postgres":
+      return `postgres://beignet:beignet@127.0.0.1:5432/${databaseName}`;
+    case "mysql":
+      return `mysql://root:beignet@127.0.0.1:3306/${databaseName}`;
+    default:
+      return "file:local.db";
+  }
+}
+
 /**
  * Shells supported by `beignet completion install` and `uninstall`.
  */

package/src/create-prompts.ts

@@ -7,6 +7,8 @@
  */
 
 import {
+  type DatabaseName,
+  databaseChoices,
   type IntegrationName,
   integrationChoices,
   type PackageManager,
@@ -18,6 +20,7 @@ import {
 export type CreateSelections = {
   directory?: string;
   api?: boolean;
+  db?: DatabaseName;
   integrations?: readonly IntegrationName[];
   packageManager?: PackageManager;
 };
@@ -35,9 +38,9 @@ type CreatePromptTty = {
  * Decide whether `beignet create` should run the interactive prompt flow.
  *
  * Prompts run only on a full TTY, only when `--yes` is absent, and only when
- * no selection flag was passed. Any explicit api, integration, or package
- * manager selection means the invocation is scripted, so the non-interactive
- * path stays byte-identical for agents and CI.
+ * no selection flag was passed. Any explicit api, database, integration, or
+ * package manager selection means the invocation is scripted, so the
+ * non-interactive path stays byte-identical for agents and CI.
  */
 export function shouldPromptInteractively(
   flags: CreatePromptFlags,
@@ -48,6 +51,7 @@ export function shouldPromptInteractively(
 
   const selectionFlagPassed =
     flags.api !== undefined ||
+    flags.db !== undefined ||
     (flags.integrations?.length ?? 0) > 0 ||
     flags.packageManager !== undefined;
 
@@ -60,6 +64,12 @@ const integrationHints: Record<IntegrationName, string> = {
   "upstash-rate-limit": "Upstash-backed rate limiting",
 };
 
+const databaseHints: Record<DatabaseName, string> = {
+  sqlite: "libSQL/Turso, zero setup — default",
+  postgres: "node-postgres, requires a Postgres 14+ server",
+  mysql: "mysql2, requires MySQL 8.0+",
+};
+
 /**
  * Run the interactive `beignet create` prompt flow.
  *
@@ -92,6 +102,17 @@ export async function promptCreateSelections(
   });
   if (prompts.isCancel(api)) return undefined;
 
+  const db = await prompts.select<DatabaseName>({
+    message: "Which database?",
+    options: databaseChoices.map((database) => ({
+      value: database,
+      label: database,
+      hint: databaseHints[database],
+    })),
+    initialValue: initial.db ?? "sqlite",
+  });
+  if (prompts.isCancel(db)) return undefined;
+
   const integrations = await prompts.multiselect<IntegrationName>({
     message: "Add provider integrations? (press enter to skip)",
     options: integrationChoices.map((integration) => ({
@@ -108,6 +129,7 @@ export async function promptCreateSelections(
   return {
     directory,
     api,
+    db,
     integrations,
     packageManager: initial.packageManager,
   };

package/src/create.ts

@@ -1,6 +1,8 @@
 import { mkdir, readdir, writeFile } from "node:fs/promises";
 import path from "node:path";
 import {
+  type DatabaseName,
+  databaseChoices,
   getTemplateFiles,
   type IntegrationName,
   integrationChoices,
@@ -22,6 +24,11 @@ export type CreateOptions = {
   api?: boolean;
   packageManager?: PackageManager;
   integrations?: IntegrationName[];
+  /**
+   * Database backing the starter's Drizzle persistence layer.
+   * Defaults to "sqlite".
+   */
+  db?: DatabaseName;
   force?: boolean;
   dryRun?: boolean;
   beignetVersion?: string;
@@ -37,6 +44,7 @@ export type CreateResult = {
   dryRun: boolean;
   files: string[];
   packageManager: PackageManager;
+  database: DatabaseName;
 };
 
 /**
@@ -52,6 +60,7 @@ export async function createProject(
   const template = options.template ?? "next";
   const api = Boolean(options.api);
   const integrations = resolveIntegrations(options.integrations ?? []);
+  const database = options.db ?? "sqlite";
 
   if (template !== "next") {
     throw new Error(
@@ -59,6 +68,12 @@ export async function createProject(
     );
   }
 
+  if (!databaseChoices.includes(database)) {
+    throw new Error(
+      `Unknown database "${database}". Available databases: ${databaseChoices.join(", ")}`,
+    );
+  }
+
   const dryRun = Boolean(options.dryRun);
 
   await assertCanWrite(targetDir, Boolean(options.force));
@@ -69,6 +84,7 @@ export async function createProject(
     beignetVersion: options.beignetVersion ?? getDefaultBeignetVersion(),
     api,
     integrations,
+    database,
   });
 
   if (!dryRun) {
@@ -88,6 +104,7 @@ export async function createProject(
     dryRun,
     files: files.map((file) => file.path),
     packageManager,
+    database,
   };
 }
 
@@ -95,15 +112,20 @@ export async function createProject(
  * Providers that ship in every starter. They used to be `--integrations`
  * choices, so passing them gets a pointed error instead of a generic one.
  */
-const baseProviderNames = new Set(["better-auth", "drizzle-turso", "pino"]);
+const baseProviderNames = new Set(["better-auth", "drizzle-sqlite", "pino"]);
 
 function resolveIntegrations(
   explicitIntegrations: IntegrationName[],
 ): IntegrationName[] {
   for (const integration of explicitIntegrations) {
-    if (baseProviderNames.has(integration)) {
+    const integrationName: string = integration;
+    if (baseProviderNames.has(integrationName)) {
+      const databaseHint =
+        integrationName === "drizzle-sqlite"
+          ? " Choose the starter database with --db sqlite|postgres|mysql instead."
+          : "";
       throw new Error(
-        `${integration} is part of every Beignet starter and no longer an --integrations choice.`,
+        `${integration} is part of every Beignet starter and no longer an --integrations choice.${databaseHint}`,
       );
     }
   }

package/src/index.ts

@@ -16,6 +16,9 @@ import {
 import {
   type CompletionShell,
   completionShellChoices,
+  type DatabaseName,
+  databaseChoices,
+  databaseStartCommand,
   type IntegrationName,
   integrationChoices,
   type MakeFeatureAddon,
@@ -44,6 +47,7 @@ const outputFormatChoices = [
 type CreateFlags = {
   template: TemplateName;
   api?: boolean;
+  db?: DatabaseName;
   packageManager?: PackageManager;
   integrations?: readonly IntegrationName[];
   yes?: boolean;
@@ -282,10 +286,11 @@ const createCommand = buildCommand<
   docs: {
     brief: "Create a new Beignet app.",
     fullDescription: `Scaffolds a full-stack Beignet starter: typed contracts, Better Auth,
-Drizzle/libSQL persistence with checked-in migrations, pino logging,
-devtools, and a shadcn UI shell. Pass --api for an API-only scaffold
-without the UI shell.
+Drizzle persistence with checked-in migrations, pino logging, devtools,
+and a shadcn UI shell. Pass --api for an API-only scaffold without the
+UI shell, and --db to choose the database.
 
+Available databases: ${databaseChoices.join(", ")}
 Available integrations: ${integrationChoices.join(", ")}
 
 Running create on an interactive terminal without selection flags opens a
@@ -305,6 +310,12 @@ prompt-based setup. Pass --yes or any selection flag to skip the prompts.`,
         withNegated: false,
         brief: "Scaffold an API-only app without the UI shell.",
       },
+      db: {
+        kind: "enum",
+        values: databaseChoices,
+        optional: true,
+        brief: "Database for Drizzle persistence. Default: sqlite.",
+      },
       packageManager: {
         kind: "enum",
         values: packageManagerChoices,
@@ -354,6 +365,7 @@ prompt-based setup. Pass --yes or any selection flag to skip the prompts.`,
       let selections: CreateSelections = {
         directory,
         api: flags.api,
+        db: flags.db,
         integrations: flags.integrations,
         packageManager: flags.packageManager,
       };
@@ -382,6 +394,7 @@ prompt-based setup. Pass --yes or any selection flag to skip the prompts.`,
       }
 
       const api = selections.api ?? false;
+      const database = selections.db ?? "sqlite";
       const integrations = uniqueValues([...(selections.integrations ?? [])]);
       const result = await createProject({
         name: selections.directory,
@@ -389,6 +402,7 @@ prompt-based setup. Pass --yes or any selection flag to skip the prompts.`,
         api,
         packageManager: selections.packageManager,
         integrations,
+        db: database,
         force: Boolean(flags.force),
         dryRun: Boolean(flags.dryRun),
       });
@@ -397,7 +411,7 @@ prompt-based setup. Pass --yes or any selection flag to skip the prompts.`,
         this,
         flags.json
           ? JSON.stringify(result, null, 2)
-          : nextSteps(result, { api, integrations }),
+          : nextSteps(result, { api, integrations, database }),
       );
     };
   },
@@ -1238,6 +1252,7 @@ function nextSteps(
   options: {
     api?: boolean;
     integrations?: readonly IntegrationName[];
+    database?: DatabaseName;
   } = {},
 ): string {
   if (result.dryRun) {
@@ -1261,6 +1276,15 @@ ${plannedFiles}`;
   const openStep = options.api
     ? "  open http://localhost:3000 for the API landing page"
     : "  open http://localhost:3000/sign-up";
+  const startDatabaseCommand = options.database
+    ? databaseStartCommand(options.database, result.name)
+    : undefined;
+  const startDatabaseStep = startDatabaseCommand
+    ? `Start the database:
+  ${startDatabaseCommand}
+
+`
+    : "";
 
   return `Created ${result.name} at ${result.targetDir}
 
@@ -1269,7 +1293,7 @@ Next steps:
   ${pm} install
   cp .env.example .env.local
 ${envStep}
-Prepare the database:
+${startDatabaseStep}Prepare the database:
   ${cli} db migrate
 
 Start the app:

package/src/inspect.ts

@@ -1865,6 +1865,14 @@ async function inspectRouteErrorCatalogDrift(
   return diagnostics;
 }
 
+type ProviderDoctorVariantRule = {
+  name: string;
+  displayName: string;
+  tokens: readonly string[];
+  requiredEnv: readonly string[];
+  registrationSeverity?: "warning" | "hint";
+};
+
 type ProviderDoctorRule = {
   packageName: string;
   displayName: string;
@@ -1872,6 +1880,7 @@ type ProviderDoctorRule = {
   appPorts?: readonly { name: string; type: string }[];
   requiredEnv?: readonly string[];
   registrationSeverity?: "warning" | "hint";
+  variants?: readonly ProviderDoctorVariantRule[];
 };
 
 type ProviderPackageMetadataSource = {
@@ -1960,8 +1969,40 @@ async function inspectProductionReadiness(
     }
   }
 
+  const providerEntries = await readProviderListEntries(
+    targetDir,
+    files,
+    config,
+    sourceCache,
+  );
+
   for (const provider of providerDoctorRules) {
     if (!installedPackages.has(provider.packageName)) continue;
+
+    if (provider.variants !== undefined) {
+      // Multi-variant packages only require the env vars of the variants the
+      // app actually registers; an unused variant must not warn.
+      for (const variant of detectedProviderVariants(
+        provider.variants,
+        providerEntries,
+      )) {
+        for (const envVar of variant.requiredEnv) {
+          if (
+            await anyFileContains(targetDir, configFiles, envVar, sourceCache)
+          ) {
+            continue;
+          }
+          diagnostics.push({
+            severity: "warning",
+            code: "BEIGNET_PROVIDER_ENV_MISSING",
+            file: "package.json",
+            message: `${provider.packageName} is installed and ${variant.displayName} is registered, but ${envVar} is not mentioned in app env/config files. ${variant.displayName} requires ${envVar}; add the environment variable or remove the provider registration.`,
+          });
+        }
+      }
+      continue;
+    }
+
     for (const envVar of provider.requiredEnv ?? []) {
       if (await anyFileContains(targetDir, configFiles, envVar, sourceCache)) {
         continue;
@@ -2153,23 +2194,38 @@ async function inspectProviderRegistrationDrift(
   );
   const providerFiles = serverProviderFiles(files, config);
   const sourceCache = new Map<string, string>();
-  const providerSource = (
-    await Promise.all(
-      providerFiles.map((file) =>
-        readCachedSource(targetDir, file, sourceCache),
-      ),
-    )
-  ).join("\n");
-  const providerListSource = extractProviderListSource(providerSource);
-  const providerEntries =
-    providerListSource === undefined
-      ? []
-      : providerListEntries(providerListSource);
+  const providerEntries = await readProviderListEntries(
+    targetDir,
+    files,
+    config,
+    sourceCache,
+  );
 
   for (const provider of providerDoctorRules) {
+    if (!installedPackages.has(provider.packageName)) continue;
+
+    if (provider.variants !== undefined) {
+      if (
+        detectedProviderVariants(provider.variants, providerEntries).length > 0
+      ) {
+        continue;
+      }
+      const severity = providerVariantRegistrationSeverity(provider.variants);
+      if (severity === undefined) continue;
+      const hints = provider.variants
+        .filter((variant) => variant.tokens.length > 0)
+        .map((variant) => registrationTokenHint(variant.tokens));
+      diagnostics.push({
+        severity,
+        code: "BEIGNET_PROVIDER_REGISTRATION_MISSING",
+        file: providerFiles[0] ?? config.paths.server,
+        message: `${provider.packageName} is installed, but no ${provider.displayName} variant is registered in server/providers.ts. Register one of the available providers (${hints.join(", ")}) in the exported providers array or remove the unused package.`,
+      });
+      continue;
+    }
+
     const severity = provider.registrationSeverity;
     if (severity === undefined) continue;
-    if (!installedPackages.has(provider.packageName)) continue;
     if (
       provider.tokens.some((token) =>
         providerEntries.some((entry) => entry.includes(token)),
@@ -2190,8 +2246,12 @@ async function inspectProviderRegistrationDrift(
   }
 
   const drizzleIndex = findProviderEntryIndex(providerEntries, [
-    "drizzleTursoProvider",
-    "createDrizzleTursoProvider",
+    "drizzleSqliteProvider",
+    "createDrizzleSqliteProvider",
+    "drizzlePostgresProvider",
+    "createDrizzlePostgresProvider",
+    "drizzleMysqlProvider",
+    "createDrizzleMysqlProvider",
   ]);
   const appDatabaseProviderIndex = findProviderEntryIndex(providerEntries, [
     "starterDatabaseProvider",
@@ -2209,7 +2269,7 @@ async function inspectProviderRegistrationDrift(
       code: "BEIGNET_PROVIDER_ORDER",
       file: providerFiles[0] ?? config.paths.server,
       message:
-        "An app database provider is registered before createDrizzleTursoProvider(...). Register the Drizzle/Turso provider first so app-owned database wiring can read ctx.ports.db during setup.",
+        "An app database provider is registered before the Drizzle database provider. Register the Drizzle database provider first so app-owned database wiring can read ctx.ports.db during setup.",
     });
   }
 
@@ -2361,12 +2421,70 @@ function providerDoctorRuleFromMetadata(
     tokens: registration?.tokens ?? [],
     appPorts: metadata.appPorts ?? [],
     requiredEnv: metadata.requiredEnv ?? [],
-    registrationSeverity:
-      registration?.severity ??
-      (registration?.required === true ? "warning" : undefined),
+    registrationSeverity: registrationSeverityFromMetadata(registration),
+    variants: metadata.variants?.map((variant) => ({
+      name: variant.name,
+      displayName: variant.displayName ?? variant.name,
+      tokens: variant.registration?.tokens ?? [],
+      requiredEnv: variant.requiredEnv ?? [],
+      registrationSeverity: registrationSeverityFromMetadata(
+        variant.registration,
+      ),
+    })),
   };
 }
 
+function registrationSeverityFromMetadata(
+  registration:
+    | { required?: boolean; severity?: "warning" | "hint" }
+    | undefined,
+): "warning" | "hint" | undefined {
+  return (
+    registration?.severity ??
+    (registration?.required === true ? "warning" : undefined)
+  );
+}
+
+function detectedProviderVariants(
+  variants: readonly ProviderDoctorVariantRule[],
+  providerEntries: readonly string[],
+): ProviderDoctorVariantRule[] {
+  return variants.filter((variant) =>
+    variant.tokens.some((token) =>
+      providerEntries.some((entry) => entry.includes(token)),
+    ),
+  );
+}
+
+function providerVariantRegistrationSeverity(
+  variants: readonly ProviderDoctorVariantRule[],
+): "warning" | "hint" | undefined {
+  const severities = variants.map((variant) => variant.registrationSeverity);
+  if (severities.includes("warning")) return "warning";
+  if (severities.includes("hint")) return "hint";
+  return undefined;
+}
+
+async function readProviderListEntries(
+  targetDir: string,
+  files: string[],
+  config: ResolvedBeignetConfig,
+  sourceCache: Map<string, string>,
+): Promise<string[]> {
+  const providerFiles = serverProviderFiles(files, config);
+  const providerSource = (
+    await Promise.all(
+      providerFiles.map((file) =>
+        readCachedSource(targetDir, file, sourceCache),
+      ),
+    )
+  ).join("\n");
+  const providerListSource = extractProviderListSource(providerSource);
+  return providerListSource === undefined
+    ? []
+    : providerListEntries(providerListSource);
+}
+
 function registrationTokenHint(tokens: readonly string[]): string {
   const token = tokens[0];
   if (!token) return "the provider";