Merge pull request #443 from JochenDiekenbrock/fix-consumes-test/plain

Fix consumes test/plain

Author: js2me

index.d.ts

@@ -315,6 +315,7 @@ export enum RequestContentKind {
   FORM_DATA = "FORM_DATA",
   IMAGE = "IMAGE",
   OTHER = "OTHER",
+  TEXT = "TEXT",
 }
 
 export interface RequestResponseInfo {

src/schema-parser/schema-routes.js

@@ -16,6 +16,7 @@ const CONTENT_KIND = {
   FORM_DATA: "FORM_DATA",
   IMAGE: "IMAGE",
   OTHER: "OTHER",
+  TEXT: "TEXT",
 };
 
 class SchemaRoutes {
@@ -265,6 +266,12 @@ class SchemaRoutes {
       return CONTENT_KIND.IMAGE;
     }
 
+    if (
+        _.some(contentTypes, (contentType) => _.startsWith(contentType, "text/"))
+    ) {
+      return CONTENT_KIND.TEXT;
+    }
+
     return CONTENT_KIND.OTHER;
   };
 

templates/base/http-clients/axios-http-client.ejs

@@ -33,6 +33,7 @@ export enum ContentType {
   Json = "application/json",
   FormData = "multipart/form-data",
   UrlEncoded = "application/x-www-form-urlencoded",
+  Text = "text/plain",
 }
 
 export class HttpClient<SecurityDataType = unknown> {
@@ -114,6 +115,10 @@ export class HttpClient<SecurityDataType = unknown> {
           body = this.createFormData(body as Record<string, unknown>);
         }
 
+        if (type === ContentType.Text && body && body !== null && typeof body !== "string") {
+          body = JSON.stringify(body);
+        }
+
         return this.instance.request({
             ...requestParams,
             headers: {

templates/base/http-clients/fetch-http-client.ejs

@@ -45,6 +45,7 @@ export enum ContentType {
     Json = "application/json",
     FormData = "multipart/form-data",
     UrlEncoded = "application/x-www-form-urlencoded",
+    Text = "text/plain",
 }
 
 export class HttpClient<SecurityDataType = unknown> {
@@ -102,6 +103,7 @@ export class HttpClient<SecurityDataType = unknown> {
 
     private contentFormatters: Record<ContentType, (input: any) => any> = {
         [ContentType.Json]: (input:any) => input !== null && (typeof input === "object" || typeof input === "string") ? JSON.stringify(input) : input,
+        [ContentType.Text]: (input:any) => input !== null && typeof input !== "string" ? JSON.stringify(input) : input,
         [ContentType.FormData]: (input: any) =>
             Object.keys(input || {}).reduce((formData, key) => {
                 const property = input[key];

templates/default/procedure-call.ejs

@@ -50,6 +50,7 @@ const requestContentKind = {
     "JSON": "ContentType.Json",
     "URL_ENCODED": "ContentType.UrlEncoded",
     "FORM_DATA": "ContentType.FormData",
+    "TEXT": "ContentType.Text",
 }
 // RequestParams["format"]
 const responseContentKind = {

templates/modular/procedure-call.ejs

@@ -50,6 +50,7 @@ const requestContentKind = {
     "JSON": "ContentType.Json",
     "URL_ENCODED": "ContentType.UrlEncoded",
     "FORM_DATA": "ContentType.FormData",
+    "TEXT": "ContentType.Text",
 }
 // RequestParams["format"]
 const responseContentKind = {

tests/generated/v2.0/adafruit.ts

@@ -208,6 +208,7 @@ export enum ContentType {
   Json = "application/json",
   FormData = "multipart/form-data",
   UrlEncoded = "application/x-www-form-urlencoded",
+  Text = "text/plain",
 }
 
 export class HttpClient<SecurityDataType = unknown> {
@@ -262,6 +263,7 @@ export class HttpClient<SecurityDataType = unknown> {
   private contentFormatters: Record<ContentType, (input: any) => any> = {
     [ContentType.Json]: (input: any) =>
       input !== null && (typeof input === "object" || typeof input === "string") ? JSON.stringify(input) : input,
+    [ContentType.Text]: (input: any) => (input !== null && typeof input !== "string" ? JSON.stringify(input) : input),
     [ContentType.FormData]: (input: any) =>
       Object.keys(input || {}).reduce((formData, key) => {
         const property = input[key];

tests/generated/v2.0/another-example.ts

@@ -174,6 +174,7 @@ export enum ContentType {
   Json = "application/json",
   FormData = "multipart/form-data",
   UrlEncoded = "application/x-www-form-urlencoded",
+  Text = "text/plain",
 }
 
 export class HttpClient<SecurityDataType = unknown> {
@@ -228,6 +229,7 @@ export class HttpClient<SecurityDataType = unknown> {
   private contentFormatters: Record<ContentType, (input: any) => any> = {
     [ContentType.Json]: (input: any) =>
       input !== null && (typeof input === "object" || typeof input === "string") ? JSON.stringify(input) : input,
+    [ContentType.Text]: (input: any) => (input !== null && typeof input !== "string" ? JSON.stringify(input) : input),
     [ContentType.FormData]: (input: any) =>
       Object.keys(input || {}).reduce((formData, key) => {
         const property = input[key];

tests/generated/v2.0/another-schema.ts

@@ -72,6 +72,7 @@ export enum ContentType {
   Json = "application/json",
   FormData = "multipart/form-data",
   UrlEncoded = "application/x-www-form-urlencoded",
+  Text = "text/plain",
 }
 
 export class HttpClient<SecurityDataType = unknown> {
@@ -126,6 +127,7 @@ export class HttpClient<SecurityDataType = unknown> {
   private contentFormatters: Record<ContentType, (input: any) => any> = {
     [ContentType.Json]: (input: any) =>
       input !== null && (typeof input === "object" || typeof input === "string") ? JSON.stringify(input) : input,
+    [ContentType.Text]: (input: any) => (input !== null && typeof input !== "string" ? JSON.stringify(input) : input),
     [ContentType.FormData]: (input: any) =>
       Object.keys(input || {}).reduce((formData, key) => {
         const property = input[key];

tests/generated/v2.0/api-with-examples.ts

@@ -51,6 +51,7 @@ export enum ContentType {
   Json = "application/json",
   FormData = "multipart/form-data",
   UrlEncoded = "application/x-www-form-urlencoded",
+  Text = "text/plain",
 }
 
 export class HttpClient<SecurityDataType = unknown> {
@@ -105,6 +106,7 @@ export class HttpClient<SecurityDataType = unknown> {
   private contentFormatters: Record<ContentType, (input: any) => any> = {
     [ContentType.Json]: (input: any) =>
       input !== null && (typeof input === "object" || typeof input === "string") ? JSON.stringify(input) : input,
+    [ContentType.Text]: (input: any) => (input !== null && typeof input !== "string" ? JSON.stringify(input) : input),
     [ContentType.FormData]: (input: any) =>
       Object.keys(input || {}).reduce((formData, key) => {
         const property = input[key];
@@ -270,4 +272,21 @@ export class Api<SecurityDataType extends unknown> extends HttpClient<SecurityDa
         ...params,
       }),
   };
+  consumesPlainText = {
+    /**
+     * @description consumes plain text
+     *
+     * @name ConsumesPlainText
+     * @summary consumes plain text
+     * @request POST:/consumes-plain-text/
+     */
+    consumesPlainText: (someParm: string, params: RequestParams = {}) =>
+      this.request<any, void>({
+        path: `/consumes-plain-text/`,
+        method: "POST",
+        body: someParm,
+        type: ContentType.Text,
+        ...params,
+      }),
+  };
 }