refactor(typegen): removed optional when required path params are used

pas-mike · Dec 18, 2023 · 2c7a37b · 2c7a37b
1 parent 343c555
commit 2c7a37b
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 31 deletions.
diff --git a/packages/typegen/package-lock.json b/packages/typegen/package-lock.json
diff --git a/packages/typegen/src/typegen.ts b/packages/typegen/src/typegen.ts
@@ -105,9 +105,16 @@ function generateMethodForOperation(methodName: string, operation: Operation, ex
   // parameters arg
   const normalizedOperationId = convertKeyToTypeName(operationId);
   const normalizedPath = convertKeyToTypeName(operation.path);
-  const parameterTypePaths = _.chain([
+
+  const pathParameterTypePaths = _.chain([
     _.find(exportTypes, { schemaRef: `#/paths/${normalizedOperationId}/pathParameters` }),
     _.find(exportTypes, { schemaRef: `#/paths/${normalizedPath}/pathParameters` }),
+  ])
+    .filter()
+    .map('path')
+    .value();
+
+  const parameterTypePaths = _.chain([
     _.find(exportTypes, { schemaRef: `#/paths/${normalizedOperationId}/queryParameters` }),
     _.find(exportTypes, { schemaRef: `#/paths/${normalizedPath}/queryParameters` }),
     _.find(exportTypes, { schemaRef: `#/paths/${normalizedOperationId}/headerParameters` }),
@@ -117,10 +124,16 @@ function generateMethodForOperation(methodName: string, operation: Operation, ex
   ])
     .filter()
     .map('path')
-    .value();
+    .value()
+    .concat(pathParameterTypePaths);
 
   const parametersType = !_.isEmpty(parameterTypePaths) ? parameterTypePaths.join(' & ') : 'UnknownParamsObject';
-  const parametersArg = `parameters?: Parameters<${parametersType}> | null`;
+  let parametersArg = `parameters?: Parameters<${parametersType}> | null`;
+
+  // All path parameters are required
+  if (_.isEmpty(pathParameterTypePaths)) {
+    parametersArg = `parameters: Parameters<${parametersType}>`;
+  }
 
   // payload arg
   const requestBodyType = _.find(exportTypes, { schemaRef: `#/paths/${normalizedOperationId}/requestBody` });