ng-openapi 0.0.6 → 0.0.8

package/cli.cjs

@@ -767,10 +767,6 @@ function camelCase(str) {
   return cleaned.charAt(0).toLowerCase() + cleaned.slice(1);
 }
 __name(camelCase, "camelCase");
-function kebabCase(str) {
-  return str.replace(/([a-z])([A-Z])/g, "$1-$2").toLowerCase();
-}
-__name(kebabCase, "kebabCase");
 function pascalCase(str) {
   return str.replace(/(?:^|[-_])([a-z])/g, (_, char) => char.toUpperCase());
 }
@@ -907,20 +903,51 @@ var ServiceMethodBodyGenerator = class {
         });
         continue;
       }
+      const isPrimitive = this.isPrimitiveType(schema);
       const inferredType = this.inferResponseTypeFromContentType(contentType);
       let priority = 3;
-      if (inferredType === "json") {
+      let finalType = inferredType;
+      if (inferredType === "json" && isPrimitive) {
+        finalType = "text";
+        priority = 2;
+      } else if (inferredType === "json") {
         priority = 2;
       }
       responseTypes.push({
-        type: inferredType,
+        type: finalType,
         priority,
-        contentType
+        contentType,
+        isPrimitive
       });
     }
     responseTypes.sort((a, b) => a.priority - b.priority);
     return responseTypes[0]?.type || "json";
   }
+  isPrimitiveType(schema) {
+    if (!schema) return false;
+    const primitiveTypes = [
+      "string",
+      "number",
+      "integer",
+      "boolean"
+    ];
+    if (primitiveTypes.includes(schema.type)) {
+      return true;
+    }
+    if (schema.type === "array") {
+      return false;
+    }
+    if (schema.type === "object" || schema.properties) {
+      return false;
+    }
+    if (schema.$ref) {
+      return false;
+    }
+    if (schema.allOf || schema.oneOf || schema.anyOf) {
+      return false;
+    }
+    return false;
+  }
   createGenerationContext(operation) {
     return {
       pathParams: operation.parameters?.filter((p) => p.in === "path") || [],
@@ -1331,20 +1358,51 @@ var ServiceMethodOverloadsGenerator = class {
         });
         continue;
       }
+      const isPrimitive = this.isPrimitiveType(schema);
       const inferredType = this.inferResponseTypeFromContentType(contentType);
       let priority = 3;
-      if (inferredType === "json") {
+      let finalType = inferredType;
+      if (inferredType === "json" && isPrimitive) {
+        finalType = "text";
+        priority = 2;
+      } else if (inferredType === "json") {
         priority = 2;
       }
       responseTypes.push({
-        type: inferredType,
+        type: finalType,
         priority,
-        contentType
+        contentType,
+        isPrimitive
       });
     }
     responseTypes.sort((a, b) => a.priority - b.priority);
     return responseTypes[0]?.type || "json";
   }
+  isPrimitiveType(schema) {
+    if (!schema) return false;
+    const primitiveTypes = [
+      "string",
+      "number",
+      "integer",
+      "boolean"
+    ];
+    if (primitiveTypes.includes(schema.type)) {
+      return true;
+    }
+    if (schema.type === "array") {
+      return false;
+    }
+    if (schema.type === "object" || schema.properties) {
+      return false;
+    }
+    if (schema.$ref) {
+      return false;
+    }
+    if (schema.allOf || schema.oneOf || schema.anyOf) {
+      return false;
+    }
+    return false;
+  }
   getResponseType(response) {
     const responseType = this.getResponseTypeFromResponse(response);
     switch (responseType) {
@@ -1561,7 +1619,7 @@ var ServiceGenerator = class {
     return groups;
   }
   generateServiceFile(controllerName, operations, outputDir) {
-    const fileName = `${kebabCase(controllerName)}.service.ts`;
+    const fileName = `${camelCase(controllerName)}.service.ts`;
     const filePath = path5.join(outputDir, fileName);
     const sourceFile = this.project.createSourceFile(filePath, "", {
       overwrite: true

package/index.js

@@ -806,10 +806,6 @@ function camelCase(str) {
   return cleaned.charAt(0).toLowerCase() + cleaned.slice(1);
 }
 __name(camelCase, "camelCase");
-function kebabCase(str) {
-  return str.replace(/([a-z])([A-Z])/g, "$1-$2").toLowerCase();
-}
-__name(kebabCase, "kebabCase");
 function pascalCase(str) {
   return str.replace(/(?:^|[-_])([a-z])/g, (_, char) => char.toUpperCase());
 }
@@ -946,20 +942,51 @@ var _ServiceMethodBodyGenerator = class _ServiceMethodBodyGenerator {
         });
         continue;
       }
+      const isPrimitive = this.isPrimitiveType(schema);
       const inferredType = this.inferResponseTypeFromContentType(contentType);
       let priority = 3;
-      if (inferredType === "json") {
+      let finalType = inferredType;
+      if (inferredType === "json" && isPrimitive) {
+        finalType = "text";
+        priority = 2;
+      } else if (inferredType === "json") {
         priority = 2;
       }
       responseTypes.push({
-        type: inferredType,
+        type: finalType,
         priority,
-        contentType
+        contentType,
+        isPrimitive
       });
     }
     responseTypes.sort((a, b) => a.priority - b.priority);
     return ((_c = responseTypes[0]) == null ? void 0 : _c.type) || "json";
   }
+  isPrimitiveType(schema) {
+    if (!schema) return false;
+    const primitiveTypes = [
+      "string",
+      "number",
+      "integer",
+      "boolean"
+    ];
+    if (primitiveTypes.includes(schema.type)) {
+      return true;
+    }
+    if (schema.type === "array") {
+      return false;
+    }
+    if (schema.type === "object" || schema.properties) {
+      return false;
+    }
+    if (schema.$ref) {
+      return false;
+    }
+    if (schema.allOf || schema.oneOf || schema.anyOf) {
+      return false;
+    }
+    return false;
+  }
   createGenerationContext(operation) {
     var _a, _b;
     return {
@@ -1375,20 +1402,51 @@ var _ServiceMethodOverloadsGenerator = class _ServiceMethodOverloadsGenerator {
         });
         continue;
       }
+      const isPrimitive = this.isPrimitiveType(schema);
       const inferredType = this.inferResponseTypeFromContentType(contentType);
       let priority = 3;
-      if (inferredType === "json") {
+      let finalType = inferredType;
+      if (inferredType === "json" && isPrimitive) {
+        finalType = "text";
+        priority = 2;
+      } else if (inferredType === "json") {
         priority = 2;
       }
       responseTypes.push({
-        type: inferredType,
+        type: finalType,
         priority,
-        contentType
+        contentType,
+        isPrimitive
       });
     }
     responseTypes.sort((a, b) => a.priority - b.priority);
     return ((_c = responseTypes[0]) == null ? void 0 : _c.type) || "json";
   }
+  isPrimitiveType(schema) {
+    if (!schema) return false;
+    const primitiveTypes = [
+      "string",
+      "number",
+      "integer",
+      "boolean"
+    ];
+    if (primitiveTypes.includes(schema.type)) {
+      return true;
+    }
+    if (schema.type === "array") {
+      return false;
+    }
+    if (schema.type === "object" || schema.properties) {
+      return false;
+    }
+    if (schema.$ref) {
+      return false;
+    }
+    if (schema.allOf || schema.oneOf || schema.anyOf) {
+      return false;
+    }
+    return false;
+  }
   getResponseType(response) {
     const responseType = this.getResponseTypeFromResponse(response);
     switch (responseType) {
@@ -1604,7 +1662,7 @@ var _ServiceGenerator = class _ServiceGenerator {
     return groups;
   }
   generateServiceFile(controllerName, operations, outputDir) {
-    const fileName = `${kebabCase(controllerName)}.service.ts`;
+    const fileName = `${camelCase(controllerName)}.service.ts`;
     const filePath = path5.join(outputDir, fileName);
     const sourceFile = this.project.createSourceFile(filePath, "", {
       overwrite: true

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ng-openapi",
-  "version": "0.0.6",
+  "version": "0.0.8",
   "description": "Generate Angular services and TypeScript types from OpenAPI/Swagger specifications",
   "keywords": [
     "angular",