From adf00a0bbd325655ac6fb4090c66166ab8f37ce3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tr=C3=A8sAbhi?= <43380238+tresabhi@users.noreply.github.com>
Date: Sat, 12 Oct 2024 21:38:48 -0500
Subject: [PATCH] feat: branch naming

---
 packages/website/src/components/HomeHero.astro | 10 +++++-----
 packages/website/src/components/Navbar.astro   | 10 +++++-----
 packages/website/src/constants/branches.ts     |  4 ----
 packages/website/src/core/blitzkit/branches.ts | 16 ++++++++++++++++
 4 files changed, 26 insertions(+), 14 deletions(-)
 delete mode 100644 packages/website/src/constants/branches.ts
 create mode 100644 packages/website/src/core/blitzkit/branches.ts

diff --git a/packages/website/src/components/HomeHero.astro b/packages/website/src/components/HomeHero.astro
index 91e4aff47..392a4dd9a 100644
--- a/packages/website/src/components/HomeHero.astro
+++ b/packages/website/src/components/HomeHero.astro
@@ -1,11 +1,11 @@
 ---
 import { imgur } from '@blitzkit/core';
 import { Code, Flex, Heading, Text } from '@radix-ui/themes';
-import { BRANCH_NAMES } from '../constants/branches';
+import { undefined } from 'astro:schema';
+import { resolveBranchName } from '../core/blitzkit/branches';
 
-const isBranchNamed =
-  import.meta.env.PUBLIC_ASSET_BRANCH &&
-  BRANCH_NAMES[import.meta.env.PUBLIC_ASSET_BRANCH];
+const branchName = resolveBranchName();
+const isBranchNamed = branchName !== undefined;
 ---
 
 <style>
@@ -58,7 +58,7 @@ const isBranchNamed =
           {
             isBranchNamed && (
               <Code size="8" color="gray" highContrast variant="outline">
-                {BRANCH_NAMES[import.meta.env.PUBLIC_ASSET_BRANCH!]}
+                {branchName}
               </Code>
             )
           }
diff --git a/packages/website/src/components/Navbar.astro b/packages/website/src/components/Navbar.astro
index de0827042..daadaba5f 100644
--- a/packages/website/src/components/Navbar.astro
+++ b/packages/website/src/components/Navbar.astro
@@ -17,16 +17,16 @@ import {
   Separator,
   Text,
 } from '@radix-ui/themes';
-import { BRANCH_NAMES } from '../constants/branches';
+import { resolveBranchName } from '../core/blitzkit/branches';
 import { homeTool, TOOLS } from '../constants/tools';
 import { PatreonIcon } from './PatreonIcon';
 import { NavbarAccount } from './NavbarAccount';
+import { undefined } from 'astro:schema';
 
 const toolsFiltered = TOOLS.filter((tool) => !('href' in tool));
 const tools = [homeTool, ...toolsFiltered];
-const isBranchNamed =
-  import.meta.env.PUBLIC_ASSET_BRANCH &&
-  BRANCH_NAMES[import.meta.env.PUBLIC_ASSET_BRANCH];
+const branchName = resolveBranchName();
+const isBranchNamed = branchName !== undefined;
 ---
 
 <style>
@@ -124,7 +124,7 @@ const isBranchNamed =
               {
                 isBranchNamed && (
                   <Code color="gray" size="1" highContrast variant="outline">
-                    {BRANCH_NAMES[import.meta.env.PUBLIC_ASSET_BRANCH!]}
+                    {branchName}
                   </Code>
                 )
               }
diff --git a/packages/website/src/constants/branches.ts b/packages/website/src/constants/branches.ts
deleted file mode 100644
index e00bb5f68..000000000
--- a/packages/website/src/constants/branches.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export const BRANCH_NAMES: Record<string, string> = {
-  dev: 'dev',
-  opentest: 'opentest',
-};
diff --git a/packages/website/src/core/blitzkit/branches.ts b/packages/website/src/core/blitzkit/branches.ts
new file mode 100644
index 000000000..be699edc5
--- /dev/null
+++ b/packages/website/src/core/blitzkit/branches.ts
@@ -0,0 +1,16 @@
+import { assertSecret } from '@blitzkit/core';
+
+const BRANCH_NAMES: Record<string, string> = {
+  dev: 'beta',
+  opentest: 'opentest',
+};
+
+export function resolveBranchName() {
+  if (assertSecret(import.meta.env.MODE) === 'development') {
+    return 'dev';
+  } else {
+    return BRANCH_NAMES[assertSecret(import.meta.env.PUBLIC_ASSET_BRANCH)] as
+      | string
+      | undefined;
+  }
+}