Skip to content

fix: refactor config.ts env var loading to table-driven pattern #219

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
himerus merged 1 commit into from
Mar 26, 2026
Merged

fix: refactor config.ts env var loading to table-driven pattern #219

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
70 changes: 25 additions & 45 deletions packages/core/src/config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ const defaults: McpWcConfig = {
};

function readConfigFile(projectRoot: string): Partial<McpWcConfig> {
// Primary config file name
const primaryPath = resolve(projectRoot, 'helixir.mcp.json');
if (existsSync(primaryPath)) {
try {
Expand All @@ -44,21 +43,6 @@ function readConfigFile(projectRoot: string): Partial<McpWcConfig> {
}
}

// Backward-compatible fallback to legacy config file name
const legacyPath = resolve(projectRoot, 'mcpwc.config.json');
if (existsSync(legacyPath)) {
process.stderr.write(
`[helixir] Warning: mcpwc.config.json is deprecated. Rename to helixir.mcp.json.\n`,
);
try {
const raw = readFileSync(legacyPath, 'utf-8');
return JSON.parse(raw) as Partial<McpWcConfig>;
} catch {
process.stderr.write(`[helixir] Warning: mcpwc.config.json is malformed. Using defaults.\n`);
return {};
}
}

return {};
}

Expand Down Expand Up @@ -92,36 +76,32 @@ export function loadConfig(): Readonly<McpWcConfig> {
}

// Apply env vars (highest priority)
if (process.env['MCP_WC_CEM_PATH'] !== undefined) {
config.cemPath = process.env['MCP_WC_CEM_PATH'];
}
if (process.env['MCP_WC_PROJECT_ROOT'] !== undefined) {
config.projectRoot = process.env['MCP_WC_PROJECT_ROOT'];
}
if (process.env['MCP_WC_COMPONENT_PREFIX'] !== undefined) {
config.componentPrefix = process.env['MCP_WC_COMPONENT_PREFIX'];
}
if (process.env['MCP_WC_HEALTH_HISTORY_DIR'] !== undefined) {
config.healthHistoryDir = process.env['MCP_WC_HEALTH_HISTORY_DIR'];
}
if (process.env['MCP_WC_TSCONFIG_PATH'] !== undefined) {
config.tsconfigPath = process.env['MCP_WC_TSCONFIG_PATH'];
}
if (process.env['MCP_WC_TOKENS_PATH'] !== undefined) {
const val = process.env['MCP_WC_TOKENS_PATH'];
config.tokensPath = val === 'null' ? null : val;
}
if (process.env['MCP_WC_CDN_BASE'] !== undefined) {
const val = process.env['MCP_WC_CDN_BASE'];
config.cdnBase = val === 'null' ? null : val;
}
if (process.env['MCP_WC_CDN_AUTOLOADER'] !== undefined) {
const val = process.env['MCP_WC_CDN_AUTOLOADER'];
config.cdnAutoloader = val === 'null' ? null : val;
// String keys map directly; nullable keys treat the literal string 'null' as null.
const ENV_MAP_STRING: Readonly<Record<string, keyof McpWcConfigMutable>> = {
MCP_WC_CEM_PATH: 'cemPath',
MCP_WC_PROJECT_ROOT: 'projectRoot',
MCP_WC_COMPONENT_PREFIX: 'componentPrefix',
MCP_WC_HEALTH_HISTORY_DIR: 'healthHistoryDir',
MCP_WC_TSCONFIG_PATH: 'tsconfigPath',
};
const ENV_MAP_NULLABLE: Readonly<Record<string, keyof McpWcConfigMutable>> = {
MCP_WC_TOKENS_PATH: 'tokensPath',
MCP_WC_CDN_BASE: 'cdnBase',
MCP_WC_CDN_AUTOLOADER: 'cdnAutoloader',
MCP_WC_CDN_STYLESHEET: 'cdnStylesheet',
};

for (const [envKey, configKey] of Object.entries(ENV_MAP_STRING)) {
const val = process.env[envKey];
if (val !== undefined) {
(config as Record<string, unknown>)[configKey] = val;
}
}
if (process.env['MCP_WC_CDN_STYLESHEET'] !== undefined) {
const val = process.env['MCP_WC_CDN_STYLESHEET'];
config.cdnStylesheet = val === 'null' ? null : val;
for (const [envKey, configKey] of Object.entries(ENV_MAP_NULLABLE)) {
const val = process.env[envKey];
if (val !== undefined) {
(config as Record<string, unknown>)[configKey] = val === 'null' ? null : val;
}
}

// --watch CLI flag overrides config file value
Expand Down
Loading