item-wms-public-api-tool 2.0.6 → 2.0.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "item-wms-public-api-tool",
-  "version": "2.0.6",
+  "version": "2.0.8",
   "description": "Public APIs for auth, EDI import, queries, uploads, and item master data.",
   "main": "dist/index.js",
   "bin": {

package/scripts/sync-openapi.js

@@ -32,9 +32,22 @@ function isJsonLike(raw) {
   return trimmed.startsWith('{') || trimmed.startsWith('[');
 }
 
-function normalizeToolName(method, pathName) {
-  const normalizedPath = pathName.replace(/[^a-zA-Z0-9]+/g, '_').replace(/^_+|_+$/g, '');
-  return `${method.toLowerCase()}_${normalizedPath.toLowerCase()}`;
+function normalizeToolName(pathName, prefix) {
+  let trimmedPath = pathName;
+  if (prefix) {
+    const normalizedPrefix = prefix.startsWith('/') ? prefix : `/${prefix}`;
+    const prefixWithSlash = normalizedPrefix.endsWith('/') ? normalizedPrefix : `${normalizedPrefix}/`;
+    if (trimmedPath.startsWith(prefixWithSlash)) {
+      trimmedPath = trimmedPath.slice(prefixWithSlash.length);
+    } else if (trimmedPath.startsWith(normalizedPrefix)) {
+      trimmedPath = trimmedPath.slice(normalizedPrefix.length);
+    }
+  }
+  if (!trimmedPath) {
+    trimmedPath = pathName;
+  }
+  const normalizedPath = trimmedPath.replace(/[^a-zA-Z0-9]+/g, '_').replace(/^_+|_+$/g, '');
+  return normalizedPath.toLowerCase();
 }
 
 function fetchText(url, redirects = 0) {
@@ -70,6 +83,27 @@ function ensureDir(dirPath) {
   }
 }
 
+function stripDefaultParamRequired(node) {
+  if (!node || typeof node !== 'object') {
+    return;
+  }
+  if (Array.isArray(node)) {
+    node.forEach(stripDefaultParamRequired);
+    return;
+  }
+  if (Array.isArray(node.required)) {
+    const next = node.required.filter((key) => !DEFAULT_PARAM_KEYS.includes(key));
+    if (next.length > 0) {
+      node.required = next;
+    } else {
+      delete node.required;
+    }
+  }
+  for (const value of Object.values(node)) {
+    stripDefaultParamRequired(value);
+  }
+}
+
 function parseOpenApi(raw) {
   if (!raw || !raw.trim()) {
     throw new Error('OpenAPI content is empty.');
@@ -215,6 +249,7 @@ function buildInputSchema(operation, parameters, components) {
 
 function buildTools(openapi) {
   const tools = [];
+  const usedNames = new Set();
   const operations = openapi.paths || {};
   for (const [pathName, pathItem] of Object.entries(operations)) {
     if (PATH_PREFIX && !pathName.startsWith(PATH_PREFIX)) {
@@ -226,13 +261,18 @@ function buildTools(openapi) {
       if (!operation) {
         continue;
       }
-      const baseName = normalizeToolName(method, pathName);
+      const baseName = normalizeToolName(pathName, PATH_PREFIX);
       let name = baseName;
+      const methodSuffix = method.toLowerCase();
+      if (usedNames.has(name)) {
+        name = `${baseName}_${methodSuffix}`;
+      }
       let counter = 2;
-      while (tools.find((tool) => tool.name === name)) {
-        name = `${baseName}_${counter}`;
+      while (usedNames.has(name)) {
+        name = `${baseName}_${methodSuffix}_${counter}`;
         counter += 1;
       }
+      usedNames.add(name);
       const parameters = [
         ...commonParams,
         ...(Array.isArray(operation.parameters) ? operation.parameters : [])
@@ -259,6 +299,7 @@ async function main() {
   fs.writeFileSync(SNAPSHOT_PATH, raw.endsWith('\n') ? raw : `${raw}\n`);
 
   const openapi = parseOpenApi(raw);
+  stripDefaultParamRequired(openapi);
   if (!openapi || !openapi.paths) {
     throw new Error('Invalid OpenAPI content: missing "paths".');
   }

package/src/openapi-tools.ts

@@ -107,9 +107,22 @@ function applyDefaultParams(
   return nextArgs;
 }
 
-function normalizeToolName(method: string, pathName: string): string {
-  const normalizedPath = pathName.replace(/[^a-zA-Z0-9]+/g, '_').replace(/^_+|_+$/g, '');
-  return `${method.toLowerCase()}_${normalizedPath.toLowerCase()}`;
+function normalizeToolName(pathName: string, prefix?: string): string {
+  let trimmedPath = pathName;
+  if (prefix) {
+    const normalizedPrefix = prefix.startsWith('/') ? prefix : `/${prefix}`;
+    const prefixWithSlash = normalizedPrefix.endsWith('/') ? normalizedPrefix : `${normalizedPrefix}/`;
+    if (trimmedPath.startsWith(prefixWithSlash)) {
+      trimmedPath = trimmedPath.slice(prefixWithSlash.length);
+    } else if (trimmedPath.startsWith(normalizedPrefix)) {
+      trimmedPath = trimmedPath.slice(normalizedPrefix.length);
+    }
+  }
+  if (!trimmedPath) {
+    trimmedPath = pathName;
+  }
+  const normalizedPath = trimmedPath.replace(/[^a-zA-Z0-9]+/g, '_').replace(/^_+|_+$/g, '');
+  return normalizedPath.toLowerCase();
 }
 
 function mergeSchema(base: Record<string, any>, extra?: Record<string, any>): Record<string, any> {
@@ -264,7 +277,7 @@ export function buildOpenApiIndex(spec: any, options?: { pathPrefix?: string }):
       if (!operation) {
         continue;
       }
-      const name = normalizeToolName(method, pathName);
+      const baseName = normalizeToolName(pathName, prefix);
       const parameters = [
         ...commonParams,
         ...(Array.isArray(operation.parameters) ? operation.parameters : [])
@@ -272,10 +285,14 @@ export function buildOpenApiIndex(spec: any, options?: { pathPrefix?: string }):
       const description = operation.summary || operation.description || `${method.toUpperCase()} ${pathName}`;
       const inputSchema = buildInputSchema(operation, parameters, spec.components);
 
-      let finalName = name;
+      let finalName = baseName;
+      const methodSuffix = method.toLowerCase();
+      if (operations[finalName]) {
+        finalName = `${baseName}_${methodSuffix}`;
+      }
       let counter = 2;
       while (operations[finalName]) {
-        finalName = `${name}_${counter}`;
+        finalName = `${baseName}_${methodSuffix}_${counter}`;
         counter += 1;
       }
 

package/test-ai-integration.js

@@ -101,11 +101,11 @@ console.log('   // AI工具代码示例');
 console.log('   const mcpConfig = JSON.parse(fs.readFileSync("mcp.json", "utf8"));');
 console.log('   ');
 console.log('   // 发现工具');
-console.log('   const loginTool = mcpConfig.tools.find(tool => tool.name === "post_v1_public_user_login");');
+console.log('   const loginTool = mcpConfig.tools.find(tool => tool.name === "user_login");');
 console.log('   ');
 console.log('   // 调用工具');
 console.log('   const result = await executeMCPCommand(');
-console.log('     JSON.stringify({ jsonrpc: "2.0", id: 1, method: "tools/call", params: { name: "post_v1_public_user_login", arguments: { username: "testuser", password: "testpass" }, options: { baseUrl: "https://wms-staging.item.com/api/public" } } })');
+console.log('     JSON.stringify({ jsonrpc: "2.0", id: 1, method: "tools/call", params: { name: "user_login", arguments: { username: "testuser", password: "testpass" }, options: { baseUrl: "https://wms-staging.item.com/api/public" } } })');
 console.log('   );');
 console.log('   ');
 console.log('   // 解析结果');