From ffbe157e32f53d031573d8d0e6cc4fa337462f49 Mon Sep 17 00:00:00 2001
From: gonzaloriestra <14979109+gonzaloriestra@users.noreply.github.com>
Date: Tue, 25 Aug 2026 00:20:55 +0000
Subject: [PATCH 1/2] [Refactor] Simplify parseGid using optional chaining and
 guard clause

---
 packages/cli-kit/src/public/node/themes/utils.ts | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/packages/cli-kit/src/public/node/themes/utils.ts b/packages/cli-kit/src/public/node/themes/utils.ts
index bee6ad98ed8..79ded657ef7 100644
--- a/packages/cli-kit/src/public/node/themes/utils.ts
+++ b/packages/cli-kit/src/public/node/themes/utils.ts
@@ -27,9 +27,10 @@ export function composeThemeGid(id: number): string {
 }
 
 export function parseGid(gid: string): number {
-  const matches = GID_REGEXP.exec(gid)
-  if (matches && matches[1] !== undefined) {
-    return parseInt(matches[1], 10)
+  const match = GID_REGEXP.exec(gid)?.[1]
+  if (!match) {
+    throw new Error(`Invalid GID: ${gid}`)
   }
-  throw new Error(`Invalid GID: ${gid}`)
+
+  return parseInt(match, 10)
 }

From 13dc1b6a7dc37bf7ef1eaaf5e8c9da20961d026f Mon Sep 17 00:00:00 2001
From: gonzaloriestra <14979109+gonzaloriestra@users.noreply.github.com>
Date: Tue, 25 Aug 2026 00:32:05 +0000
Subject: [PATCH 2/2] [Refactor] Simplify parseGid using optional chaining and
 guard clause

---
 packages/cli-kit/src/public/node/themes/utils.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/cli-kit/src/public/node/themes/utils.ts b/packages/cli-kit/src/public/node/themes/utils.ts
index 79ded657ef7..168453038a3 100644
--- a/packages/cli-kit/src/public/node/themes/utils.ts
+++ b/packages/cli-kit/src/public/node/themes/utils.ts
@@ -28,7 +28,7 @@ export function composeThemeGid(id: number): string {
 
 export function parseGid(gid: string): number {
   const match = GID_REGEXP.exec(gid)?.[1]
-  if (!match) {
+  if (match === undefined) {
     throw new Error(`Invalid GID: ${gid}`)
   }