Skip to content

fix(#2364): Add support for passing parameters to @ApiOperation #2365

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/itchy-jobs-create.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"openapi-metadata": patch
---

fix(#2364) for allowing to add params via ApiOperation tag
9 changes: 8 additions & 1 deletion packages/openapi-metadata/src/decorators/api-operation.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
import { type OperationMetadata, OperationMetadataStorage } from "../metadata/operation.js";
import {
type OperationMetadata,
OperationMetadataStorage,
OperationParameterMetadataStorage,
} from "../metadata/index.js";

export type ApiOperationOptions = OperationMetadata;

Expand All @@ -11,5 +15,8 @@ export type ApiOperationOptions = OperationMetadata;
export function ApiOperation(options: ApiOperationOptions): MethodDecorator {
return (target, propertyKey) => {
OperationMetadataStorage.defineMetadata(target, options, propertyKey);
if (Array.isArray(options.parameters)) {
OperationParameterMetadataStorage.mergeMetadata(target, options.parameters, propertyKey);
}
};
}
8 changes: 7 additions & 1 deletion packages/openapi-metadata/src/metadata/operation.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import type { OpenAPIV3 } from "openapi-types";
import type { HttpMethods } from "../types.js";
import { createMetadataStorage } from "./factory.js";
import type { OperationParameterMetadata } from "./operation-parameter.js";

export type OperationMetadata = Omit<OpenAPIV3.OperationObject, "responses"> & {
export type OperationMetadata = Omit<OpenAPIV3.OperationObject, "responses" | "parameters"> & {
/**
* Operation path.
* Can include parameters.
Expand All @@ -13,6 +14,11 @@ export type OperationMetadata = Omit<OpenAPIV3.OperationObject, "responses"> & {
* Available methods for this operation.
*/
methods?: HttpMethods[];

/**
* Represents metadata about an operation parameter.
*/
parameters?: OperationParameterMetadata[];
};

export const OperationMetadataKey = Symbol("Operation");
Expand Down
28 changes: 23 additions & 5 deletions packages/openapi-metadata/test/decorators.test.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
import "reflect-metadata";
import {
ApiBasicAuth,
ApiBearerAuth,
ApiBody,
ApiCookie,
ApiCookieAuth,
ApiExcludeController,
ApiExcludeOperation,
ApiExtraModels,
ApiHeader,
ApiOauth2,
ApiOperation,
ApiParam,
ApiProperty,
Expand All @@ -19,26 +23,40 @@ import {
ExtraModelsMetadataStorage,
OperationBodyMetadataStorage,
OperationMetadataStorage,
type OperationParameterMetadata,
OperationParameterMetadataStorage,
OperationResponseMetadataStorage,
OperationSecurityMetadataStorage,
PropertyMetadataStorage,
} from "../src/metadata/index.js";
import { ApiBasicAuth, ApiBearerAuth, ApiCookieAuth, ApiOauth2 } from "../src/decorators/api-security.js";

test("@ApiOperation", () => {
const parameters: OperationParameterMetadata[] = [
{
in: "path",
name: "id",
},
] as const;

class MyController {
@ApiOperation({ summary: "Hello", path: "/test", methods: ["get"] })
@ApiOperation({
summary: "Hello",
path: "/test",
methods: ["get"],
parameters,
})
operation() {}
}

const metadata = OperationMetadataStorage.getMetadata(MyController.prototype, "operation");

expect(metadata).toEqual({
const operationMetadata = OperationMetadataStorage.getMetadata(MyController.prototype, "operation");
const parameterMetadata = OperationParameterMetadataStorage.getMetadata(MyController.prototype, "operation");
expect(operationMetadata).toEqual({
summary: "Hello",
path: "/test",
methods: ["get"],
parameters,
});
expect(parameterMetadata).toEqual(parameters);
});

test("@ApiBody", () => {
Expand Down