refactor(): allow to pass component name without DS prefix

Author: Szymon.Poltorak

packages/angular-mcp-server/src/lib/tools/ds/component-contract/builder/build-component-contract.tool.ts

@@ -10,6 +10,7 @@ import {
 } from '../shared/utils/contract-file-ops.js';
 import { ContractResult } from './models/types.js';
 import { resolveCrossPlatformPath } from '../../shared/utils/cross-platform-path.js';
+import { validateAndNormalizeComponentName } from '../../shared/utils/component-validation.js';
 
 interface BuildComponentContractOptions extends BaseHandlerOptions {
   directory: string;
@@ -30,8 +31,10 @@ export const buildComponentContractHandler = createHandler<
       templateFile,
       styleFile,
       typescriptFile,
-      dsComponentName,
     } = params;
+    
+    // Normalize component name at handler entry point
+    const dsComponentName = validateAndNormalizeComponentName(params.dsComponentName);
 
     const effectiveTemplatePath = resolveCrossPlatformPath(
       directory,

packages/angular-mcp-server/src/lib/tools/ds/component-contract/diff/diff-component-contract.tool.ts

@@ -9,7 +9,7 @@ import {
 import { diffComponentContractSchema } from './models/schema.js';
 import type { DomPathDictionary } from '../shared/models/types.js';
 import { loadContract } from '../shared/utils/contract-file-ops.js';
-import { componentNameToKebabCase } from '../../shared/utils/component-validation.js';
+import { componentNameToKebabCase, validateAndNormalizeComponentName } from '../../shared/utils/component-validation.js';
 import { basename } from 'node:path';
 import {
   consolidateAndPruneRemoveOperationsWithDeduplication,
@@ -35,6 +35,9 @@ export const diffComponentContractHandler = createHandler<
 >(
   diffComponentContractSchema.name,
   async (params, { workspaceRoot }) => {
+    // Normalize component name at handler entry point
+    const dsComponentName = validateAndNormalizeComponentName(params.dsComponentName);
+    
     const effectiveBeforePath = resolveCrossPlatformPath(
       params.directory,
       params.contractBeforePath,
@@ -57,7 +60,7 @@ export const diffComponentContractHandler = createHandler<
     const diffData = {
       before: effectiveBeforePath,
       after: effectiveAfterPath,
-      dsComponentName: params.dsComponentName,
+      dsComponentName: dsComponentName,
       timestamp: new Date().toISOString(),
       domPathDictionary: domPathDict.paths,
       changes: groupedChanges,
@@ -68,7 +71,7 @@ export const diffComponentContractHandler = createHandler<
     const normalizedDiffData = normalizePathsInObject(diffData, workspaceRoot);
 
     // Create component-specific diffs directory
-    const componentKebab = componentNameToKebabCase(params.dsComponentName);
+    const componentKebab = componentNameToKebabCase(dsComponentName);
     const diffDir = resolveCrossPlatformPath(
       workspaceRoot,
       `.cursor/tmp/contracts/${componentKebab}/diffs`,

packages/angular-mcp-server/src/lib/tools/ds/component/get-deprecated-css-classes.tool.ts

@@ -5,6 +5,7 @@ import {
   COMMON_ANNOTATIONS,
 } from '../shared/models/schema-helpers.js';
 import { getDeprecatedCssClasses } from './utils/deprecated-css-helpers.js';
+import { validateAndNormalizeComponentName } from '../shared/utils/component-validation.js';
 
 interface DeprecatedCssClassesOptions {
   componentName: string;
@@ -28,8 +29,11 @@ export const getDeprecatedCssClassesHandler = createHandler<
 >(
   getDeprecatedCssClassesSchema.name,
   async ({ componentName }, { cwd, deprecatedCssClassesPath }) => {
+    // Normalize component name at handler entry point
+    const normalizedComponentName = validateAndNormalizeComponentName(componentName);
+    
     return getDeprecatedCssClasses(
-      componentName,
+      normalizedComponentName,
       deprecatedCssClassesPath,
       cwd,
     );

packages/angular-mcp-server/src/lib/tools/ds/component/get-ds-component-data.tool.ts

@@ -7,7 +7,7 @@ import { COMMON_ANNOTATIONS } from '../shared/models/schema-helpers.js';
 import { getComponentPathsInfo } from './utils/paths-helpers.js';
 import { getComponentDocPathsForName } from './utils/doc-helpers.js';
 import {
-  validateComponentName,
+  validateAndNormalizeComponentName,
   componentNameToKebabCase,
 } from '../shared/utils/component-validation.js';
 import { resolveCrossPlatformPath } from '../shared/utils/cross-platform-path.js';
@@ -115,11 +115,13 @@ export const getDsComponentDataHandler = createHandler<
 >(
   getDsComponentDataToolSchema.name,
   async (
-    { componentName, sections = ['all'] },
+    params,
     { cwd, uiRoot, storybookDocsRoot },
   ) => {
+    const { sections = ['all'] } = params;
+    let { componentName } = params;
     try {
-      validateComponentName(componentName);
+      componentName = validateAndNormalizeComponentName(componentName);
 
       const includeAll = sections.includes('all');
       const includeImplementation =

packages/angular-mcp-server/src/lib/tools/ds/project/get-project-dependencies.tool.ts

@@ -8,7 +8,7 @@ import {
   COMMON_ANNOTATIONS,
 } from '../shared/models/schema-helpers.js';
 import { analyzeProjectDependencies } from './utils/dependencies-helpers.js';
-import { validateComponentName } from '../shared/utils/component-validation.js';
+import { validateAndNormalizeComponentName } from '../shared/utils/component-validation.js';
 
 interface ProjectDependenciesOptions extends BaseHandlerOptions {
   directory: string;
@@ -42,10 +42,11 @@ export const getProjectDependenciesHandler = createHandler<
 >(
   getProjectDependenciesSchema.name,
   async (params, { cwd, workspaceRoot, uiRoot }) => {
-    const { directory, componentName } = params;
+    const { directory } = params;
+    let { componentName } = params;
 
     if (componentName) {
-      validateComponentName(componentName);
+      componentName = validateAndNormalizeComponentName(componentName);
     }
 
     return await analyzeProjectDependencies(

packages/angular-mcp-server/src/lib/tools/ds/project/report-deprecated-css.tool.ts

@@ -5,6 +5,7 @@ import {
   BaseHandlerOptions,
   RESULT_FORMATTERS,
 } from '../shared/utils/handler-helpers.js';
+import { validateAndNormalizeComponentName } from '../shared/utils/component-validation.js';
 import {
   createDirectoryComponentSchema,
   COMMON_ANNOTATIONS,
@@ -40,7 +41,10 @@ export const reportDeprecatedCssHandler = createHandler<
 >(
   reportDeprecatedCssSchema.name,
   async (params, { cwd, deprecatedCssClassesPath }) => {
-    const { directory, componentName } = params;
+    const { directory } = params;
+    
+    // Normalize component name at handler entry point
+    const componentName = validateAndNormalizeComponentName(params.componentName);
 
     const deprecated = getDeprecatedCssClasses(
       componentName,

packages/angular-mcp-server/src/lib/tools/ds/report-violations/report-violations.tool.ts

@@ -3,6 +3,7 @@ import {
   BaseHandlerOptions,
   RESULT_FORMATTERS,
 } from '../shared/utils/handler-helpers.js';
+import { validateAndNormalizeComponentName } from '../shared/utils/component-validation.js';
 import {
   createViolationReportingSchema,
   COMMON_ANNOTATIONS,
@@ -36,7 +37,13 @@ export const reportViolationsHandler = createHandler<
     // Default to 'file' grouping if not specified
     const groupBy = params.groupBy || 'file';
 
-    const result = await analyzeViolationsBase<ViolationResult>(params);
+    // Normalize component name at handler entry point
+    const normalizedParams = {
+      ...params,
+      componentName: validateAndNormalizeComponentName(params.componentName),
+    };
+
+    const result = await analyzeViolationsBase<ViolationResult>(normalizedParams);
 
     const formattedContent = formatViolations(result, params.directory, {
       groupBy,

packages/angular-mcp-server/src/lib/tools/ds/shared/utils/component-validation.ts

@@ -1,7 +1,17 @@
 import { COMPONENT_REGEXES } from './regex-helpers.js';
 
+/**
+ * Normalizes a component name to ensure it has the "Ds" prefix
+ * @param componentName The component name (e.g., "Button" or "DsButton")
+ * @returns The normalized component name with "Ds" prefix (e.g., "DsButton")
+ */
+export function normalizeComponentName(componentName: string): string {
+  return componentName.startsWith('Ds') ? componentName : `Ds${componentName}`;
+}
+
 /**
  * Validates that a component name is a valid Design System component name
+ * Accepts both formats: "Button" and "DsButton"
  * @param componentName The component name to validate
  * @throws Error if the component name is invalid
  */
@@ -14,22 +24,34 @@ export function validateComponentName(
     !COMPONENT_REGEXES.isValidDsComponent(componentName)
   ) {
     throw new Error(
-      'Invalid component name. Must be a string starting with "Ds".',
+      'Invalid component name. Must be a valid PascalCase string (e.g., "Button" or "DsButton").',
     );
   }
 }
 
+/**
+ * Validates and normalizes a component name to ensure it has the "Ds" prefix
+ * Accepts both formats: "Button" and "DsButton" but always returns "DsButton"
+ * @param componentName The component name to validate and normalize
+ * @returns The normalized component name with "Ds" prefix (e.g., "DsButton")
+ * @throws Error if the component name is invalid
+ */
+export function validateAndNormalizeComponentName(componentName: unknown): string {
+  validateComponentName(componentName);
+  return normalizeComponentName(componentName);
+}
+
 /**
  * Converts a Design System component name to kebab case
- * @param componentName The component name (e.g., "DsButton")
+ * @param componentName The component name (e.g., "DsButton" or "Button")
  * @returns The kebab case name (e.g., "button")
  */
 export function componentNameToKebabCase(componentName: string): string {
   const kebabCase = COMPONENT_REGEXES.toKebabCase(componentName);
 
   if (!kebabCase?.trim()?.length) {
     throw new Error(
-      'Invalid component name. Must be a string starting with "Ds".',
+      'Invalid component name. Must be a valid PascalCase string (e.g., "Button" or "DsButton").',
     );
   }
 
@@ -38,7 +60,7 @@ export function componentNameToKebabCase(componentName: string): string {
 
 /**
  * Creates a tag name from a component name
- * @param componentName The component name (e.g., "DsButton")
+ * @param componentName The component name (e.g., "DsButton" or "Button")
  * @returns The tag name (e.g., "ds-button")
  */
 export function componentNameToTagName(componentName: string): string {

packages/angular-mcp-server/src/lib/tools/ds/shared/utils/handler-helpers.ts

@@ -2,7 +2,7 @@ import {
   CallToolRequest,
   CallToolResult,
 } from '@modelcontextprotocol/sdk/types.js';
-import { validateComponentName } from './component-validation.js';
+import { validateComponentName, validateAndNormalizeComponentName } from './component-validation.js';
 import { buildTextResponse, throwError } from './output.utils.js';
 import * as process from 'node:process';
 
@@ -44,6 +44,21 @@ export function validateCommonInputs(params: BaseHandlerOptions): void {
   }
 }
 
+/**
+ * Validates and normalizes common input parameters, returning normalized params
+ */
+export function validateAndNormalizeCommonInputs<T extends BaseHandlerOptions>(params: T): T {
+  if (params.componentName) {
+    params.componentName = validateAndNormalizeComponentName(params.componentName);
+  }
+
+  if (params.directory && typeof params.directory !== 'string') {
+    throw new Error('Directory parameter is required and must be a string');
+  }
+
+  return params;
+}
+
 /**
  * Sets up common environment for handlers
  */

packages/angular-mcp-server/src/lib/tools/ds/shared/utils/regex-helpers.ts

@@ -60,10 +60,10 @@ export const COMPONENT_REGEXES = {
       .toLowerCase(),
 
   /**
-   * Validates DS component name format
+   * Validates DS component name format (accepts both "DsButton" and "Button" formats)
    */
   isValidDsComponent: (name: string): boolean =>
-    /^Ds[A-Z][a-zA-Z0-9]*$/.test(name),
+    /^(Ds)?[A-Z][a-zA-Z0-9]*$/.test(name),
 
   /**
    * Extracts component name from coverage titles