beer-swagger 1.0.2 → 1.0.3

package/generate-apis.js

@@ -105,6 +105,17 @@ function toParamSuffix(params, nameMap) {
     .join('');
 }
 
+// Avoid duplicate "By" when the base method name already ends with it.
+function appendParamSuffix(baseName, paramSuffix) {
+  if (!paramSuffix) {
+    return baseName;
+  }
+  if (baseName.endsWith('By') && paramSuffix.startsWith('By')) {
+    return baseName + paramSuffix.slice(2);
+  }
+  return `${baseName}${paramSuffix}`;
+}
+
 // Add a verb for single-segment paths when needed.
 function addVerbForSingleSegment(name, method) {
   const lower = name.toLowerCase();
@@ -433,6 +444,10 @@ function generateForSpec(spec, serviceName, fileBase, clientType) {
       if (name === 'unnamed') {
         name = toCamel(opId);
       }
+      const pathParams = getParams(op).filter((p) => p.in === 'path');
+      if (method === 'delete' && pathParams.length === 1) {
+        name = 'removeBy';
+      }
       if (!KEEP_METHOD_NAMES.has(name.toLowerCase()) && isAllLowerWord(name)) {
         const inferred = pathToName(p);
         const pathSegments = p.split('/')
@@ -509,7 +524,7 @@ function generateForSpec(spec, serviceName, fileBase, clientType) {
       if (seen.has(name)) {
         const paramSuffix = toParamSuffix(entryParams, paramNameMap);
         if (paramSuffix) {
-          name = `${entryName}${paramSuffix}`;
+          name = appendParamSuffix(entryName, paramSuffix);
         }
       }
       if (seen.has(name)) {
@@ -676,7 +691,7 @@ function generateForSpec(spec, serviceName, fileBase, clientType) {
 
   const baseName = toServiceBaseName(serviceName);
   const apiClassName = `${toPascal(baseName)}Api`;
-  const factoryName = `get${apiClassName}`;
+  const factoryName = apiClassName === 'ApiApi' ? 'getApi' : `get${apiClassName}`;
   const cacheName = `${baseName}ApiCache`;
   const lines = [];
   lines.push('/*');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "beer-swagger",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "bin": {
     "beer-swagger": "./generate-apis.js"
   },