refactor: add type safety to auto-detected providers (#1072)

nitrojs · Mar 22, 2023 · 246ba03 · 246ba03
1 parent a022135
commit 246ba03
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/src/options.ts b/src/options.ts
@@ -106,7 +106,8 @@ export async function loadOptions(
   configOverrides: NitroConfig = {}
 ): Promise<NitroOptions> {
   // Preset
-  let presetOverride = configOverrides.preset || process.env.NITRO_PRESET;
+  let presetOverride =
+    (configOverrides.preset as string) || process.env.NITRO_PRESET;
   const defaultPreset = detectTarget() || "node-server";
   if (configOverrides.dev) {
     presetOverride = "nitro-dev";
@@ -146,7 +147,7 @@ export async function loadOptions(
 
   options.preset =
     presetOverride ||
-    layers.find((l) => l.config.preset)?.config.preset ||
+    (layers.find((l) => l.config.preset)?.config.preset as string) ||
     defaultPreset;
 
   options.rootDir = resolve(options.rootDir || ".");

diff --git a/src/utils/index.ts b/src/utils/index.ts
@@ -7,7 +7,9 @@ import consola from "consola";
 import chalk from "chalk";
 import { getProperty } from "dot-prop";
 import { provider } from "std-env";
-import { Nitro } from "../types";
+import type { ProviderName } from "std-env";
+import { KebabCase, Nitro } from "../types";
+import type * as _PRESETS from "../presets";
 
 export function hl(str: string) {
   return chalk.cyan(str);
@@ -98,9 +100,11 @@ export function replaceAll(input: string, from: string, to: string) {
   return input.replace(new RegExp(from, "g"), to);
 }
 
-const autodetectableProviders = {
+const autodetectableProviders: Partial<
+  Record<ProviderName, KebabCase<keyof typeof _PRESETS>>
+> = {
   azure_static: "azure",
-  cloudflare_pages: "cloudflare_pages",
+  cloudflare_pages: "cloudflare-pages",
   netlify: "netlify",
   stormkit: "stormkit",
   vercel: "vercel",