fix: reduce diff

Author: mnahkies

packages/openapi-code-generator/src/core/input.ts

@@ -23,7 +23,7 @@ import type {
   IRModelObject,
   IRModelString,
   IROperation,
-  IROperationParams,
+  IROperationParameters,
   IRParameter,
   IRParameterBase,
   IRParameterCookie,
@@ -174,7 +174,7 @@ export class Input {
           servers: this.normalizeServers(
             coalesce(definition.servers, paths.servers, []),
           ),
-          params: this.parameterNormalizer.normalizeParameters(
+          parameters: this.parameterNormalizer.normalizeParameters(
             operationId,
             parameters,
           ),
@@ -458,7 +458,7 @@ export class ParameterNormalizer {
   public normalizeParameters(
     operationId: string,
     parameters: (Parameter | Reference)[] = [],
-  ): IROperationParams {
+  ): IROperationParameters {
     const allParameters = parameters.map((it) => this.loader.parameter(it))
 
     const pathParameters = allParameters.filter((it) => it.in === "path")

packages/openapi-code-generator/src/core/openapi-types-normalized.ts

@@ -175,7 +175,7 @@ export type IRParameter =
  * $ref - location of the schema encapsulating params into an object
  * list - list of the parameters
  */
-export interface IROperationParams {
+export interface IROperationParameters {
   all: IRParameter[]
   path: {name: string; list: IRParameterPath[]; $ref: Reference | undefined}
   query: {name: string; list: IRParameterQuery[]; $ref: Reference | undefined}
@@ -188,7 +188,7 @@ export interface IROperation {
   route: string
   method: HttpMethod
 
-  params: IROperationParams
+  parameters: IROperationParameters
 
   tags: string[]
   requestBody: IRRequestBody | undefined

packages/openapi-code-generator/src/typescript/client/client-operation-builder.ts

@@ -62,7 +62,7 @@ export class ClientOperationBuilder {
   }
 
   routeToTemplateString(paramName = "p"): string {
-    const {route, params} = this.operation
+    const {route, parameters} = this.operation
     const placeholders = extractPlaceholders(route)
 
     return placeholders.reduce((result, {placeholder, wholeString}) => {
@@ -72,7 +72,9 @@ export class ClientOperationBuilder {
         )
       }
 
-      const parameter = params.path.list.find((it) => it.name === placeholder)
+      const parameter = parameters.path.list.find(
+        (it) => it.name === placeholder,
+      )
 
       if (!parameter) {
         throw new Error(
@@ -89,15 +91,17 @@ export class ClientOperationBuilder {
   }
 
   methodParameter(): MethodParameterDefinition | undefined {
-    const {params} = this.operation
+    const {parameters} = this.operation
     const requestBody = this.requestBodyAsParameter()
 
     return combineParams(
-      [...params.all, requestBody?.parameter].filter(isDefined).map((it) => ({
-        name: `${camelCase(it.name)}`,
-        type: this.models.schemaObjectToType(it.schema),
-        required: it.required,
-      })),
+      [...parameters.all, requestBody?.parameter]
+        .filter(isDefined)
+        .map((it) => ({
+          name: `${camelCase(it.name)}`,
+          type: this.models.schemaObjectToType(it.schema),
+          required: it.required,
+        })),
     )
   }
 
@@ -131,7 +135,7 @@ export class ClientOperationBuilder {
 
   queryString(): string {
     // todo: consider style / explode / allowReserved etc here
-    return this.operation.params.query.list
+    return this.operation.parameters.query.list
       .map((it) => `'${it.name}': ${this.paramName(it.name)}`)
       .join(",\n")
   }
@@ -141,7 +145,7 @@ export class ClientOperationBuilder {
   }: {
     nullContentTypeValue: "undefined" | "false"
   }): string {
-    const paramHeaders = this.operation.params.header.list.map(
+    const paramHeaders = this.operation.parameters.header.list.map(
       (it) => `'${it.name}': ${this.paramName(it.name)}`,
     )
 
@@ -168,7 +172,7 @@ export class ClientOperationBuilder {
   }
 
   hasHeader(name: string): boolean {
-    const parameter = this.operation.params.header.list.find(
+    const parameter = this.operation.parameters.header.list.find(
       (it) => it.name.toLowerCase() === name.toLowerCase(),
     )
 

packages/openapi-code-generator/src/typescript/server/server-operation-builder.ts

@@ -73,7 +73,7 @@ export class ServerOperationBuilder {
   }
 
   get route(): string {
-    const {route, params} = this.operation
+    const {route, parameters} = this.operation
 
     const placeholders = extractPlaceholders(route)
 
@@ -84,7 +84,9 @@ export class ServerOperationBuilder {
         )
       }
 
-      const parameter = params.path.list.find((it) => it.name === placeholder)
+      const parameter = parameters.path.list.find(
+        (it) => it.name === placeholder,
+      )
 
       if (!parameter) {
         throw new Error(
@@ -161,7 +163,7 @@ export class ServerOperationBuilder {
   }
 
   private pathParameters(): Parameters["path"] {
-    const $ref = this.operation.params.path.$ref
+    const $ref = this.operation.parameters.path.$ref
 
     const schema = $ref
       ? this.schemaBuilder.fromModel(this.input.schema($ref), true, true)
@@ -173,11 +175,11 @@ export class ServerOperationBuilder {
       type = this.types.schemaObjectToType($ref)
     }
 
-    return {name: this.operation.params.path.name, schema: schema, type}
+    return {name: this.operation.parameters.path.name, schema: schema, type}
   }
 
   private queryParameters(): Parameters["query"] {
-    const $ref = this.operation.params.query.$ref
+    const $ref = this.operation.parameters.query.$ref
 
     const schema = $ref
       ? this.schemaBuilder.fromModel(this.input.schema($ref), true, true)
@@ -189,11 +191,11 @@ export class ServerOperationBuilder {
       type = this.types.schemaObjectToType($ref)
     }
 
-    return {name: this.operation.params.query.name, schema: schema, type}
+    return {name: this.operation.parameters.query.name, schema: schema, type}
   }
 
   private headerParameters(): Parameters["header"] {
-    const $ref = this.operation.params.header.$ref
+    const $ref = this.operation.parameters.header.$ref
 
     const schema = $ref
       ? this.schemaBuilder.fromModel(this.input.schema($ref), true, true)
@@ -205,7 +207,7 @@ export class ServerOperationBuilder {
       type = this.types.schemaObjectToType($ref)
     }
 
-    return {name: this.operation.params.header.name, schema: schema, type}
+    return {name: this.operation.parameters.header.name, schema: schema, type}
   }
 
   private requestBodyParameter(): Parameters["body"] {

packages/openapi-code-generator/src/typescript/server/typescript-koa/typescript-koa-router-builder.spec.ts

@@ -83,7 +83,7 @@ describe("typescript/server/typescript-koa/koa-router-builder", () => {
 
       serverRouterBuilder.add({
         method: "GET",
-        params: {
+        parameters: {
           all: [],
           path: {list: [], name: "", $ref: undefined},
           query: {list: [], name: "", $ref: undefined},
@@ -101,7 +101,7 @@ describe("typescript/server/typescript-koa/koa-router-builder", () => {
       })
       serverRouterBuilder.add({
         method: "GET",
-        params: {
+        parameters: {
           all: [],
           path: {list: [], name: "", $ref: undefined},
           query: {list: [], name: "", $ref: undefined},