From 67f8dc571244dbe904cb92ed2f7fbf74b788f344 Mon Sep 17 00:00:00 2001
From: Vincent Koc <vincentkoc@ieee.org>
Date: Thu, 2 Apr 2026 00:34:38 +0900
Subject: [PATCH] fix(discord): avoid duplicate component id exports

---
 extensions/discord/src/components.ts | 27 +++++++--------------------
 1 file changed, 7 insertions(+), 20 deletions(-)

diff --git a/extensions/discord/src/components.ts b/extensions/discord/src/components.ts
index 641253d3081..552649d754b 100644
--- a/extensions/discord/src/components.ts
+++ b/extensions/discord/src/components.ts
@@ -24,23 +24,10 @@ import {
 } from "@buape/carbon";
 import { ButtonStyle, MessageFlags, TextInputStyle } from "discord-api-types/v10";
 import {
-  DISCORD_COMPONENT_CUSTOM_ID_KEY,
-  DISCORD_MODAL_CUSTOM_ID_KEY,
-  buildDiscordComponentCustomId,
-  buildDiscordModalCustomId,
-  parseDiscordComponentCustomId,
-  parseDiscordComponentCustomIdForCarbon,
-  parseDiscordModalCustomId,
-  parseDiscordModalCustomIdForCarbon,
+  buildDiscordComponentCustomId as buildDiscordComponentCustomIdImpl,
+  buildDiscordModalCustomId as buildDiscordModalCustomIdImpl,
+  parseDiscordModalCustomIdForCarbon as parseDiscordModalCustomIdForCarbonImpl,
 } from "./component-custom-id.js";
-export {
-  buildDiscordComponentCustomId,
-  buildDiscordModalCustomId,
-  parseDiscordComponentCustomId,
-  parseDiscordComponentCustomIdForCarbon,
-  parseDiscordModalCustomId,
-  parseDiscordModalCustomIdForCarbon,
-};
 
 // Some test-only module graphs partially mock `@buape/carbon` and can drop `Modal`.
 // Keep dynamic form definitions loadable instead of crashing unrelated suites.
@@ -683,7 +670,7 @@ function createButtonComponent(params: {
       : undefined;
   const customId =
     internalCustomId ??
-    buildDiscordComponentCustomId({
+    buildDiscordComponentCustomIdImpl({
       componentId,
       modalId: params.modalId,
     });
@@ -726,7 +713,7 @@ function createSelectComponent(params: {
 } {
   const type = (params.spec.type ?? "string").toLowerCase() as DiscordComponentSelectType;
   const componentId = params.componentId ?? createShortId("sel_");
-  const customId = buildDiscordComponentCustomId({ componentId });
+  const customId = buildDiscordComponentCustomIdImpl({ componentId });
   if (type === "string") {
     const options = params.spec.options ?? [];
     if (options.length === 0) {
@@ -1103,12 +1090,12 @@ export class DiscordFormModal extends ModalBase {
   title: string;
   customId: string;
   components: Array<Label | TextDisplay>;
-  customIdParser = parseDiscordModalCustomIdForCarbon;
+  customIdParser = parseDiscordModalCustomIdForCarbonImpl;
 
   constructor(params: { modalId: string; title: string; fields: DiscordModalFieldDefinition[] }) {
     super();
     this.title = params.title;
-    this.customId = buildDiscordModalCustomId(params.modalId);
+    this.customId = buildDiscordModalCustomIdImpl(params.modalId);
     this.components = params.fields.map((field) => {
       const component = createModalFieldComponent(field);
       class DynamicLabel extends Label {