beer-swagger 1.0.1 → 1.0.3

package/.idea/git_toolbox_prj.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="GitToolBoxProjectSettings">
+    <option name="commitMessageIssueKeyValidationOverride">
+      <BoolValueOverride>
+        <option name="enabled" value="true" />
+      </BoolValueOverride>
+    </option>
+    <option name="commitMessageValidationEnabledOverride">
+      <BoolValueOverride>
+        <option name="enabled" value="true" />
+      </BoolValueOverride>
+    </option>
+  </component>
+</project>

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();
@@ -197,6 +208,13 @@ function mapSchemaToType(schema, schemas, useTypes) {
     }
     return useTypes ? `Types.${refName}` : '{}';
   }
+  if (!type && items) {
+    const itemType = mapSchemaToType(items, schemas, useTypes);
+    if (itemType === '{}' || itemType === '[]') {
+      return '[]';
+    }
+    return `${itemType}[]`;
+  }
   if (type === 'string') {
     return 'string';
   }
@@ -235,11 +253,15 @@ function mapParamSchemaToType(schema, schemas, useTypes) {
     type,
     format
   } = schema;
+  const { items } = schema;
   if ($ref) {
     const refName = normalizeDtoName($ref.split('/')
       .pop());
     return useTypes ? `Types.${refName}` : '{}';
   }
+  if (!type && items) {
+    return '[]';
+  }
   if (type === 'string') {
     return 'string';
   }
@@ -422,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('/')
@@ -498,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)) {
@@ -665,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('/*');
@@ -725,6 +751,10 @@ function mapSchemaToTsType(schema, schemas) {
     }
     return normalizeDtoName(refName);
   }
+  if (!type && items) {
+    const itemType = mapSchemaToTsType(items, schemas);
+    return `${itemType}[]`;
+  }
   if (schemaEnum && schemaEnum.length) {
     return schemaEnum.map((v) => (typeof v === 'string' ? `'${v}'` : String(v)))
       .join(' | ');

package/package.json

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