Merge pull request #1061 from BitGo/DX-2182-openapi-generator-failing-to-parse-utils

fix: support BlockStatement arrow functions in codec parser

Author: yanxue-22

packages/openapi-generator/src/codec.ts

@@ -459,7 +459,14 @@ function parseFunctionBody(
     return errorLeft('Function body is undefined');
   }
   if (func.body.type === 'BlockStatement') {
-    return errorLeft('BlockStatement arrow functions are not yet supported');
+    const returnStmt = func.body.stmts.find((s) => s.type === 'ReturnStatement');
+    if (!returnStmt || returnStmt.type !== 'ReturnStatement') {
+      return errorLeft('BlockStatement must contain a return statement');
+    }
+    if (!returnStmt.argument) {
+      return errorLeft('Return statement must have an argument');
+    }
+    return parseCodecInitializer(project, source, returnStmt.argument);
   }
   return parseCodecInitializer(project, source, func.body);
 }

packages/openapi-generator/test/externalModuleApiSpec.test.ts

@@ -411,3 +411,46 @@ testCase(
   },
   [],
 );
+
+testCase(
+  'simple api spec with block statement arrow functions',
+  'test/sample-types/apiSpecWithBlockArrow.ts',
+  {
+    openapi: '3.0.3',
+    info: {
+      title: 'simple api spec with block statement arrow functions',
+      version: '1.0.0',
+      description: 'simple api spec with block statement arrow functions',
+    },
+    paths: {
+      '/test': {
+        get: {
+          parameters: [],
+          responses: {
+            200: {
+              description: 'OK',
+              content: {
+                'application/json': {
+                  schema: {
+                    type: 'object',
+                    properties: {
+                      hasLargeNumberOfAddresses: {
+                        nullable: true,
+                        type: 'boolean',
+                      },
+                    },
+                    required: ['hasLargeNumberOfAddresses'],
+                  },
+                },
+              },
+            },
+          },
+        },
+      },
+    },
+    components: {
+      schemas: {},
+    },
+  },
+  [],
+);

packages/openapi-generator/test/sample-types/apiSpecWithBlockArrow.ts

@@ -0,0 +1,24 @@
+import * as h from '@api-ts/io-ts-http';
+import * as t from 'io-ts';
+import { BooleanFromString, fromNullable } from 'io-ts-types';
+
+const BooleanFromNullableWithFallback = () => {
+  return fromNullable(t.union([BooleanFromString, t.boolean]), false);
+};
+
+export const TEST_ROUTE = h.httpRoute({
+  path: '/test',
+  method: 'GET',
+  request: h.httpRequest({}),
+  response: {
+    200: t.type({
+      hasLargeNumberOfAddresses: BooleanFromNullableWithFallback(),
+    }),
+  },
+});
+
+export const apiSpec = h.apiSpec({
+  'api.test': {
+    get: TEST_ROUTE,
+  },
+});