Moved the page designer decorator MCP tool into the storefronnext toolset (#196)

* Moved the page designer decorator MCP tool into the storefronnext toolset

* Address complexity warning in the build

* Improve page-designer-decorator test coverage (73% → 95% branches) and fix max-nested-callbacks lint

Author: sf-cboscenco

packages/b2c-dx-mcp/src/tools/storefrontnext/index.ts

@@ -27,7 +27,7 @@ import type {McpTool} from '../../utils/index.js';
 import type {Services} from '../../services.js';
 import {createToolAdapter, jsonResult} from '../adapter.js';
 import {createDeveloperGuidelinesTool} from './developer-guidelines.js';
-import {createPageDesignerDecoratorTool} from '../page-designer-decorator/index.js';
+import {createPageDesignerDecoratorTool} from './page-designer-decorator/index.js';
 
 /**
  * Common input type for placeholder tools.

…/tools/page-designer-decorator/README.md …ntnext/page-designer-decorator/README.mdpackages/b2c-dx-mcp/src/tools/page-designer-decorator/README.md renamed to packages/b2c-dx-mcp/src/tools/storefrontnext/page-designer-decorator/README.md packages/b2c-dx-mcp/src/tools/page-designer-decorator/README.md renamed to packages/b2c-dx-mcp/src/tools/storefrontnext/page-designer-decorator/README.md

@@ -237,18 +237,19 @@ Run the comprehensive Mocha test suite:
 
 ```bash
 cd packages/b2c-dx-mcp
-pnpm run test:agent -- test/tools/page-designer-decorator/index.test.ts
+pnpm run test:agent -- test/tools/storefrontnext/page-designer-decorator/index.test.ts
 ```
 
 The test suite covers:
+
 - Component discovery (name-based, kebab-case, nested, path-based, custom paths, name collisions)
 - Auto mode (basic, type inference, complex props exclusion, UI-only props exclusion, edge cases)
 - Interactive mode (all steps: analyze, select_props, configure_attrs, configure_regions, confirm_generation)
 - Error handling (invalid input, invalid step name, missing parameters)
 - Edge cases (no props, only complex props, optional props, union types, already decorated components)
 - Working directory resolution (from --working-directory flag or SFCC_WORKING_DIRECTORY env var via Services)
 
-See [`test/tools/page-designer-decorator/README.md`](../../../test/tools/page-designer-decorator/README.md) for detailed testing instructions.
+See [`test/tools/storefrontnext/page-designer-decorator/README.md`](../../../../test/tools/storefrontnext/page-designer-decorator/README.md) for detailed testing instructions.
 
 ## 🎓 Learning Resources
 

…ools/page-designer-decorator/analyzer.ts …next/page-designer-decorator/analyzer.tspackages/b2c-dx-mcp/src/tools/page-designer-decorator/analyzer.ts renamed to packages/b2c-dx-mcp/src/tools/storefrontnext/page-designer-decorator/analyzer.ts packages/b2c-dx-mcp/src/tools/page-designer-decorator/analyzer.ts renamed to packages/b2c-dx-mcp/src/tools/storefrontnext/page-designer-decorator/analyzer.ts

@@ -8,8 +8,8 @@ import {z, type ZodRawShape} from 'zod';
 import {componentAnalyzer, generateTypeSuggestions, resolveComponent, type TypeSuggestion} from './analyzer.js';
 import {generateDecoratorCode, type AttributeContext, type MetadataContext} from './templates/decorator-generator.js';
 import {pageDesignerDecoratorRules} from './rules.js';
-import type {McpTool} from '../../utils/index.js';
-import type {Services} from '../../services.js';
+import type {McpTool} from '../../../utils/index.js';
+import type {Services} from '../../../services.js';
 
 // ============================================================================
 // SCHEMA DEFINITION
@@ -366,13 +366,64 @@ function handleConfigureRegionsStep(args: PageDesignerDecoratorInput, workspaceR
   };
 }
 
+function hasNonEmptyConfig(config: Record<string, unknown> | undefined): config is Record<string, unknown> {
+  return config !== null && config !== undefined && Object.keys(config).length > 0;
+}
+
+function buildAttributesFromProps(
+  selectedProps: string[],
+  props: {name: string; type: string; optional: boolean}[],
+  attributeConfig: Record<string, Record<string, unknown>>,
+): AttributeContext[] {
+  return selectedProps.flatMap((propName) => {
+    const prop = props.find((p) => p.name === propName);
+    if (!prop) return [];
+    const config = attributeConfig[propName];
+    return [
+      {
+        name: propName,
+        tsType: prop.type,
+        optional: prop.optional,
+        hasConfig: hasNonEmptyConfig(config),
+        config,
+      },
+    ];
+  });
+}
+
+function buildAttributesFromNewAttrs(
+  newAttributes: {name: string; required?: boolean}[],
+  attributeConfig: Record<string, Record<string, unknown>>,
+): AttributeContext[] {
+  return newAttributes.map((attr) => {
+    const config = attributeConfig[attr.name];
+    return {
+      name: attr.name,
+      tsType: 'string',
+      optional: !attr.required,
+      hasConfig: hasNonEmptyConfig(config),
+      config,
+    };
+  });
+}
+
+function resolveRegions(conversationContext: PageDesignerDecoratorInput['conversationContext']) {
+  const regionConfig = conversationContext?.regionConfig;
+  const enabled = Boolean(regionConfig?.enabled && regionConfig.regions?.length);
+  return {
+    hasRegions: enabled,
+    regions: enabled ? regionConfig!.regions! : [],
+    regionCount: enabled ? regionConfig!.regions!.length : 0,
+  };
+}
+
 function handleConfirmGenerationStep(args: PageDesignerDecoratorInput, workspaceRoot: string) {
   const {
     componentMetadata,
     selectedProps = [],
     newAttributes = [],
     attributeConfig = {},
-  } = args.conversationContext || {};
+  } = args.conversationContext ?? {};
 
   if (!componentMetadata) {
     return {
@@ -389,51 +440,25 @@ function handleConfirmGenerationStep(args: PageDesignerDecoratorInput, workspace
   const fullPath = resolveComponent(args.component, workspaceRoot, args.searchPaths);
   const componentInfo = componentAnalyzer.analyzeComponent(fullPath);
 
-  const attributes: AttributeContext[] = [];
-
-  for (const propName of selectedProps) {
-    const prop = componentInfo.props.find((p) => p.name === propName);
-    if (!prop) continue;
-
-    const config = attributeConfig[propName];
-    const hasConfig = config && Object.keys(config).length > 0;
-
-    attributes.push({
-      name: propName,
-      tsType: prop.type,
-      optional: prop.optional,
-      hasConfig,
-      config,
-    });
-  }
-
-  for (const attr of newAttributes) {
-    const config = attributeConfig[attr.name];
-    const hasConfig = config && Object.keys(config).length > 0;
-
-    attributes.push({
-      name: attr.name,
-      tsType: 'string',
-      optional: !attr.required,
-      hasConfig,
-      config,
-    });
-  }
+  const attributes = [
+    ...buildAttributesFromProps(selectedProps, componentInfo.props, attributeConfig),
+    ...buildAttributesFromNewAttrs(newAttributes, attributeConfig),
+  ];
 
-  const regionConfig = args.conversationContext?.regionConfig;
-  const hasRegions = regionConfig?.enabled && regionConfig.regions && regionConfig.regions.length > 0;
+  const {hasRegions, regions, regionCount} = resolveRegions(args.conversationContext);
+  const componentGroup = componentMetadata.group ?? 'odyssey_base';
 
   const context: MetadataContext = {
     needsImports: true,
     componentId: componentMetadata.id,
     componentName: componentMetadata.name,
     componentDescription: componentMetadata.description,
-    componentGroup: componentMetadata.group || 'odyssey_base',
+    componentGroup,
     metadataClassName: `${componentInfo.componentName}Metadata`,
     hasAttributes: attributes.length > 0,
-    hasRegions: hasRegions || false,
+    hasRegions,
     hasLoader: false,
-    regions: hasRegions ? regionConfig.regions || [] : [],
+    regions,
     attributes,
   };
 
@@ -443,11 +468,11 @@ function handleConfirmGenerationStep(args: PageDesignerDecoratorInput, workspace
     decoratorCode,
     componentName: componentInfo.componentName,
     componentId: componentMetadata.id,
-    componentGroup: componentMetadata.group || 'odyssey_base',
+    componentGroup,
     file: args.component,
     attributeCount: attributes.length,
-    hasRegions: hasRegions || false,
-    regionCount: hasRegions && regionConfig.regions ? regionConfig.regions.length : 0,
+    hasRegions,
+    regionCount,
   });
 
   return {