refactor: simplify

unjs · Aug 16, 2023 · 2e081b6 · 2e081b6
1 parent f1665b6
commit 2e081b6
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 38 deletions.
diff --git a/src/flags.ts b/src/flags.ts
@@ -56,6 +56,3 @@ export const isColorSupported =
 export const nodeVersion =
   (_process.versions?.node || "").replace(/^v/, "") || null;
 export const nodeMajorVersion = Number(nodeVersion?.split(".")[0]) || null;
-
-/** Current runtime name */
-export const runtimeName = detectRuntime().name;
diff --git a/src/runtimes.ts b/src/runtimes.ts
@@ -33,40 +33,26 @@ export const isNode = globalThis.process?.release?.name === "node";
 export const isBun = globalThis.process?.release?.name === "bun";
 export const isFastly = !!globalThis.fastly;
 
-export function detectRuntime(): RuntimeInfo {
-  let name: RuntimeName = "";
-
-  if (isNetlify) {
-    name = "netlify";
-  }
-
-  if (isEdgeLight) {
-    name = "edge-light";
-  }
-
-  if (isWorkerd) {
-    name = "workerd";
-  }
-
-  if (isDeno) {
-    name = "deno";
-  }
-
-  if (isLagon) {
-    name = "lagon";
-  }
-
-  if (isNode) {
-    name = "node";
-  }
-
-  if (isBun) {
-    name = "bun";
+const runtimeChecks: [boolean, RuntimeName][] = [
+  [isNetlify, "netlify"],
+  [isEdgeLight, "edge-light"],
+  [isWorkerd, "workerd"],
+  [isDeno, "deno"],
+  [isLagon, "lagon"],
+  [isNode, "node"],
+  [isBun, "bun"],
+  [isFastly, "fastly"],
+];
+
+export function detectRuntime(): RuntimeInfo | undefined {
+  const detectedRuntime = runtimeChecks.find((check) => check[0]);
+
+  if (detectedRuntime) {
+    const name = detectedRuntime[1];
+    return { name };
   }
+}
 
-  if (isFastly) {
-    name = "fastly";
-  }
+export const runtimeInfo = detectRuntime();
 
-  return { name };
-}
+export const runtime = runtimeInfo?.name || "";
diff --git a/test/index.test.ts b/test/index.test.ts
@@ -24,7 +24,6 @@ describe("std-env", () => {
         "isColorSupported",
         "nodeVersion",
         "nodeMajorVersion",
-        "runtimeName",
         "_process",
         "process",
         "detectProvider",
@@ -37,6 +36,8 @@ describe("std-env", () => {
         "isBun",
         "isFastly",
         "detectRuntime",
+        "runtimeInfo",
+        "runtime",
       ]
     `);
   });