worsoft-frontend-codegen-local-mcp 0.1.39 → 0.1.40

package/mcp_server.js

@@ -5,7 +5,7 @@ const fs = require('fs');
 const path = require('path');
 
 const SERVER_NAME = 'worsoft-codegen-local';
-const SERVER_VERSION = '0.1.39';
+const SERVER_VERSION = '0.1.40';
 const PROTOCOL_VERSION = '2024-11-05';
 const TOOL_NAME = 'worsoft_codegen_local_generate_frontend';
 const STYLE_CATALOG_PATH = path.join(__dirname, 'assets', 'style-catalog.json');
@@ -993,12 +993,34 @@ function normalizeStructuredSourceKind(value) {
   return 'entity';
 }
 
-function normalizeApiPath(value) {
-  return String(value || '')
-    .trim()
-    .replace(/^\/+/, '')
-    .replace(/\/+$/, '');
-}
+function normalizeApiPath(value) {
+  return String(value || '')
+    .trim()
+    .replace(/^\/+/, '')
+    .replace(/\/+$/, '');
+}
+
+function buildApiRoutePath(moduleName, apiPath) {
+  const normalizedApiPath = normalizeApiPath(apiPath);
+  if (!normalizedApiPath) return '';
+
+  const normalizedModuleName = normalizeModuleName(moduleName || '')
+    .split('/')
+    .filter(Boolean);
+  const apiSegments = normalizedApiPath.split('/').filter(Boolean);
+
+  if (!normalizedModuleName.length) {
+    return '/' + apiSegments.join('/');
+  }
+
+  const modulePrefix = normalizedModuleName.join('/');
+  const currentApiPath = apiSegments.join('/');
+  if (currentApiPath === modulePrefix || currentApiPath.startsWith(modulePrefix + '/')) {
+    return '/' + currentApiPath;
+  }
+
+  return '/' + [...normalizedModuleName, ...apiSegments].join('/');
+}
 
 function normalizeStructuredSqlType(value) {
   const normalized = String(value || '').trim();
@@ -1358,7 +1380,7 @@ function normalizeLevelPosition(levels, levelIndex, explicitPosition) {
   return 'right';
 }
 
-function buildMultiLevelDictModel(safeArgs) {
+function buildMultiLevelDictModel(safeArgs) {
   if (!safeArgs.levels.length) {
     throw new Error('multi_level_dict requires levels[] with explicit hierarchy metadata');
   }
@@ -1390,6 +1412,9 @@ function buildMultiLevelDictModel(safeArgs) {
   });
   const allModules = builtLevels.flatMap((level) => level.modules);
   const dictTypes = [...new Set(allModules.flatMap((module) => module.optionFields.map((field) => field.dictType).filter(Boolean)))];
+  allModules.forEach((moduleModel) => {
+    moduleModel.moduleName = resolvedTargets.moduleName;
+  });
 
   return {
     featureTitle: safeArgs.featureTitle || safeArgs.tableComment || parentModule.tableComment,
@@ -1913,19 +1938,22 @@ function renderMultiLevelOptionField(field, model, moduleModel, dictRegistryRefs
   return `${indent}{ ${parts.join(', ')} },`;
 }
 
-function renderMultiLevelModuleDefinition(model, moduleModel, dictRegistryRefs) {
-  const lines = [
-    `  ${moduleModel.key}: {`,
-    `    key: '${moduleModel.key}',`,
-    `    titleKey: '${buildMultiLevelModuleTitleKey(model, moduleModel)}',`,
-    `    apiPath: '${moduleModel.apiPath}',`,
-    `    primaryKey: '${moduleModel.pk.attrName}',`,
-  ];
+function renderMultiLevelModuleDefinition(model, moduleModel, dictRegistryRefs) {
+  const moduleApiPath = buildApiRoutePath(model.moduleName, moduleModel.apiPath);
+  const moduleEnableApi = buildApiRoutePath(model.moduleName, moduleModel.enableApi);
+  const moduleDisableApi = buildApiRoutePath(model.moduleName, moduleModel.disableApi);
+  const lines = [
+      `  ${moduleModel.key}: {`,
+      `    key: '${moduleModel.key}',`,
+      `    titleKey: '${buildMultiLevelModuleTitleKey(model, moduleModel)}',`,
+      `    apiPath: '${moduleApiPath}',`,
+      `    primaryKey: '${moduleModel.pk.attrName}',`,
+    ];
   if (moduleModel.queryParentField) lines.push(`    queryParentField: '${moduleModel.queryParentField}',`);
   if (moduleModel.statusField) lines.push(`    statusField: '${moduleModel.statusField}',`);
   if (moduleModel.statusDictType) lines.push(`    statusDictType: ${getDictRegistryReference(moduleModel.statusDictType, dictRegistryRefs)},`);
-  lines.push(`    enableApi: '${moduleModel.enableApi.startsWith('/') ? moduleModel.enableApi : '/' + moduleModel.enableApi}',`);
-  lines.push(`    disableApi: '${moduleModel.disableApi.startsWith('/') ? moduleModel.disableApi : '/' + moduleModel.disableApi}',`);
+  lines.push(`    enableApi: '${moduleEnableApi}',`);
+  lines.push(`    disableApi: '${moduleDisableApi}',`);
   lines.push('    fields: [');
   lines.push(moduleModel.optionFields.map((field) => renderMultiLevelOptionField(field, model, moduleModel, dictRegistryRefs)).join('\n'));
   lines.push('    ],');
@@ -1987,12 +2015,12 @@ function renderMultiLevelOptionsTs(model, dictRegistryRefs) {
   ].join('\n');
 }
 
-function renderMultiLevelApiFunctions(moduleModel) {
-  const pkAttr = moduleModel.pk.attrName;
-  const basePath = moduleModel.apiPath.startsWith('/') ? moduleModel.apiPath : '/' + moduleModel.apiPath;
-  const enablePath = moduleModel.enableApi.startsWith('/') ? moduleModel.enableApi : '/' + moduleModel.enableApi;
-  const disablePath = moduleModel.disableApi.startsWith('/') ? moduleModel.disableApi : '/' + moduleModel.disableApi;
-  return [
+function renderMultiLevelApiFunctions(moduleModel) {
+  const pkAttr = moduleModel.pk.attrName;
+  const basePath = buildApiRoutePath(moduleModel.moduleName, moduleModel.apiPath);
+  const enablePath = buildApiRoutePath(moduleModel.moduleName, moduleModel.enableApi);
+  const disablePath = buildApiRoutePath(moduleModel.moduleName, moduleModel.disableApi);
+  return [
     `export function fetch${moduleModel.className}List(query?: any) {`,
     '  return request({',
     `    url: '${basePath}/page',`,
@@ -2051,14 +2079,14 @@ function renderMultiLevelApiFunctions(moduleModel) {
   ].join('\n');
 }
 
-function renderMultiLevelApiTs(model) {
-  return [
-    "import request from '/@/utils/request';",
-    '',
-    model.modules.map(renderMultiLevelApiFunctions).join('\n\n'),
-    '',
-  ].join('\n');
-}
+function renderMultiLevelApiTs(model) {
+    return [
+      "import request from '/@/utils/request';",
+      '',
+      model.modules.map(renderMultiLevelApiFunctions).join('\n\n'),
+      '',
+    ].join('\n');
+  }
 
 function renderMultiLevelFormField(field) {
   const labelExpr = `getFieldLabel('${field.attrName}')`;
@@ -2581,13 +2609,14 @@ function renderMultiLevelFiles(model, sharedSupport, localeZhSupport) {
   return files;
 }
 
-function buildReplacements(model, sharedSupport) {
-  const menuBaseId = Date.now();
-  const apiModulePath = model.apiPath || `${model.moduleName}/${model.functionName}`;
-  const routePath = `${model.moduleName}/${model.functionName}`;
-  const permissionPrefix = `${model.moduleName}/${model.functionName}`.replace(/\//g, '_');
-  const dictRegistryRefs = sharedSupport.dictRegistry.keyByValue;
-  const i18nNamespace = buildI18nNamespace(model);
+function buildReplacements(model, sharedSupport) {
+  const menuBaseId = Date.now();
+  const apiModulePath = model.targetApiModule || `${model.moduleName}/${model.functionName}`;
+  const apiRoutePath = buildApiRoutePath(model.moduleName, model.apiPath || model.functionName).replace(/^\/+/, '');
+  const routePath = `${model.moduleName}/${model.functionName}`;
+  const permissionPrefix = `${model.moduleName}/${model.functionName}`.replace(/\//g, '_');
+  const dictRegistryRefs = sharedSupport.dictRegistry.keyByValue;
+  const i18nNamespace = buildI18nNamespace(model);
 
   return {
     TABLE_NAME: model.tableName,
@@ -2596,8 +2625,8 @@ function buildReplacements(model, sharedSupport) {
     CLASS_NAME: model.className,
     FUNCTION_NAME: model.functionName,
     PK_ATTR: model.pk.attrName,
-    API_MODULE_PATH: apiModulePath,
-    API_PATH: apiModulePath,
+    API_MODULE_PATH: apiModulePath,
+    API_PATH: apiRoutePath,
     VIEW_MODULE_PATH: routePath,
     MENU_ROUTE_PATH: routePath,
     I18N_NAMESPACE: i18nNamespace,
@@ -2735,10 +2764,10 @@ function buildManifest(model, safeArgs, stylePreset, files, note) {
       style: safeArgs.style,
       pageType: model.pageType || '',
       styleLabel: stylePreset.label,
-      runtimeSupported: hasRuntimeSupport(stylePreset),
+      runtimeSupported: hasRuntimeSupport(stylePreset),
       tableName: model.tableName,
       tableComment: model.tableComment,
-      apiPath: model.apiPath,
+      apiPath: buildApiRoutePath(model.moduleName, model.apiPath).replace(/^\/+/, ''),
       moduleName: model.moduleName,
       targetViewDir: model.targetViewDir,
       targetApiModule: model.targetApiModule,
@@ -2749,22 +2778,22 @@ function buildManifest(model, safeArgs, stylePreset, files, note) {
         mergeI18nZh: safeArgs.mergeI18nZh,
       },
       files: files.map((file) => ({ type: file.type, path: file.path, bytes: Buffer.byteLength(file.content, 'utf8'), status: file.status || (safeArgs.writeToDisk ? 'success' : 'rendered') })),
-      levels: model.levels.map((level) => ({
-        levelIndex: level.levelIndex,
-        position: level.position,
-        modules: level.modules.map((moduleModel) => ({
-          key: moduleModel.key,
-          tableName: moduleModel.tableName,
-          tableComment: moduleModel.tableComment,
-          apiPath: moduleModel.apiPath,
-          primaryKey: moduleModel.pk.fieldName,
-          queryParentField: moduleModel.queryParentField,
-          statusField: moduleModel.statusField,
-          statusDictType: moduleModel.statusDictType,
-          enableApi: moduleModel.enableApi,
-          disableApi: moduleModel.disableApi,
-        })),
-      })),
+        levels: model.levels.map((level) => ({
+          levelIndex: level.levelIndex,
+          position: level.position,
+          modules: level.modules.map((moduleModel) => ({
+            key: moduleModel.key,
+            tableName: moduleModel.tableName,
+            tableComment: moduleModel.tableComment,
+            apiPath: buildApiRoutePath(model.moduleName, moduleModel.apiPath).replace(/^\/+/, ''),
+            primaryKey: moduleModel.pk.fieldName,
+            queryParentField: moduleModel.queryParentField,
+            statusField: moduleModel.statusField,
+            statusDictType: moduleModel.statusDictType,
+            enableApi: buildApiRoutePath(model.moduleName, moduleModel.enableApi).replace(/^\/+/, ''),
+            disableApi: buildApiRoutePath(model.moduleName, moduleModel.disableApi).replace(/^\/+/, ''),
+          })),
+        })),
       summary: {
         totalLevels: model.levels.length,
         totalModules: model.modules.length,
@@ -2791,10 +2820,10 @@ function buildManifest(model, safeArgs, stylePreset, files, note) {
     style: safeArgs.style,
     pageType: model.pageType || '',
     styleLabel: stylePreset.label,
-    runtimeSupported: hasRuntimeSupport(stylePreset),
+    runtimeSupported: hasRuntimeSupport(stylePreset),
     tableName: model.tableName,
     tableComment: model.tableComment,
-    apiPath: model.apiPath,
+    apiPath: buildApiRoutePath(model.moduleName, model.apiPath).replace(/^\/+/, ''),
     moduleName: model.moduleName,
     targetViewDir: model.targetViewDir,
     targetApiModule: model.targetApiModule,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "worsoft-frontend-codegen-local-mcp",
-  "version": "0.1.39",
+  "version": "0.1.40",
   "description": "Worsoft frontend local-template code generation MCP server.",
   "license": "UNLICENSED",
   "author": "worsoft <sw@worsoft.vip>",