@f3liz/rescript-autogen-openapi 0.6.0 → 0.7.0

package/lib/es6/src/core/Templates.mjs

@@ -20,16 +20,14 @@ let docComment = `{{#if summary}}// {{{summary}}}
 {{/if}}{{#if description}}// {{{description}}}
 {{/if}}`;
 
-let endpointFunction = `{{{docComment}}}let {{{functionName}}} = ({{{bodyParam}}}{{{paramSep}}}~fetch: {{{fetchTypeSignature}}}): promise<{{{functionName}}}Response> => {
+let endpointFunction = `{{{docComment}}}let {{{functionName}}} = async ({{{bodyParam}}}{{{paramSep}}}~fetch: {{{fetchTypeSignature}}}): {{{functionName}}}Response => {
 {{{bodyValueConversion}}}
-  fetch(
+  let response = await fetch(
     ~url="{{{path}}}",
     ~method_="{{{methodUpper}}}",
     ~body={{{bodyArg}}},
-  )->Promise.then(response => {
+  )
 {{{responseHandling}}}
-    ->Promise.resolve
-  })
 }`;
 
 let moduleWrapped = `{{{header}}}

package/lib/es6/src/generators/EndpointGenerator.mjs

@@ -58,9 +58,9 @@ function generateEndpointFunction(endpoint, overrideDir, moduleName) {
       "202",
       "204"
     ], code => endpoint.responses[code])[0];
-  let responseHandling = Stdlib_Option.mapOr(successResponse, "  response", response => Stdlib_Option.mapOr(response.content, "  let _ = response\n  ()", content => {
+  let responseHandling = Stdlib_Option.mapOr(successResponse, "  response", response => Stdlib_Option.mapOr(response.content, "  let _ = response", content => {
     if (Object.entries(content).length !== 0) {
-      return `  let value = response->S.parseOrThrow(` + functionName + `ResponseSchema)\n  value`;
+      return `  response->S.parseOrThrow(` + functionName + `ResponseSchema)`;
     } else {
       return "  response";
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@f3liz/rescript-autogen-openapi",
-  "version": "0.6.0",
+  "version": "0.7.0",
   "description": "Generate ReScript code with Sury schemas from OpenAPI 3.1 specs. Supports multiple forks with diff/merge capabilities.",
   "keywords": [
     "rescript",

package/src/core/Templates.res

@@ -25,16 +25,14 @@ let docComment = `{{#if summary}}// {{{summary}}}
 
 // === EndpointGenerator ===
 
-let endpointFunction = `{{{docComment}}}let {{{functionName}}} = ({{{bodyParam}}}{{{paramSep}}}~fetch: {{{fetchTypeSignature}}}): promise<{{{functionName}}}Response> => {
+let endpointFunction = `{{{docComment}}}let {{{functionName}}} = async ({{{bodyParam}}}{{{paramSep}}}~fetch: {{{fetchTypeSignature}}}): {{{functionName}}}Response => {
 {{{bodyValueConversion}}}
-  fetch(
+  let response = await fetch(
     ~url="{{{path}}}",
     ~method_="{{{methodUpper}}}",
     ~body={{{bodyArg}}},
-  )->Promise.then(response => {
+  )
 {{{responseHandling}}}
-    ->Promise.resolve
-  })
 }`
 
 let moduleWrapped = `{{{header}}}

package/src/generators/EndpointGenerator.res

@@ -53,9 +53,9 @@ let generateEndpointFunction = (endpoint: endpoint, ~overrideDir=?, ~moduleName=
     ->Array.get(0)
     
   let responseHandling = successResponse->Option.mapOr("  response", response =>
-    response.content->Option.mapOr("  let _ = response\n  ()", content =>
+    response.content->Option.mapOr("  let _ = response", content =>
       Dict.toArray(content)->Array.length > 0
-        ? `  let value = response->S.parseOrThrow(${functionName}ResponseSchema)\n  value`
+        ? `  response->S.parseOrThrow(${functionName}ResponseSchema)`
         : "  response"
     )
   )