Skip to content

Commit f89aa61

Browse files
committed
docs: update comments specification → definition
- Replaces "OpenAPI specification" with "OpenAPI definition" because "OpenAPI specification" may be confused with the specification of the OpenAPI itself. - `TranslateJsonSchemaExOutput` and `translateJsonSchemaEx` become internal.
1 parent e91baa8 commit f89aa61

File tree

5 files changed

+56
-123
lines changed

5 files changed

+56
-123
lines changed

src/authorizer.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { aws_apigateway as apigateway } from 'aws-cdk-lib';
22
import { SecuritySchemeObject } from 'openapi3-ts';
33

44
/**
5-
* Authorizer augmented with the features to describe the OpenAPI specification.
5+
* Authorizer augmented with the features to describe the OpenAPI definition.
66
*
77
* @beta
88
*/

src/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Describe the Amazon API Gateway and OpenAPI specification at once with CDK.
2+
* Describe the Amazon API Gateway and OpenAPI definition at once with CDK.
33
*
44
* @packageDocumentation
55
*/

src/json-schema-ex.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -169,12 +169,12 @@ type MapSchemaProperty = typeof MAP_SCHEMA_PROPERTIES[number];
169169
/**
170170
* Output type of {@link translateJsonSchemaEx}.
171171
*
172-
* @beta
172+
* @internal
173173
*/
174174
export type TranslateJsonSchemaExOutput = {
175175
/** Equivalent `JsonSchema` for the API Gateway model. */
176176
gatewaySchema: apigateway.JsonSchema;
177-
/** Equivalent `JsonSchemaEx` for the OpenAPI specification. */
177+
/** Equivalent `JsonSchemaEx` for the OpenAPI definition. */
178178
openapiSchema: JsonSchemaEx;
179179
};
180180

@@ -184,13 +184,13 @@ export type TranslateJsonSchemaExOutput = {
184184
* @remarks
185185
*
186186
* Intepretation of {@link JsonSchemaEx.modelRef} is different between the API
187-
* Gateway model and the OpenAPI specification.
187+
* Gateway model and the OpenAPI definition.
188188
* ```
189189
* - interpreted as an external model URL for the API Gateway model.
190-
* - interpreted as an internal hash for the OpenAPI specification.
190+
* - interpreted as an internal hash for the OpenAPI definition.
191191
* ```
192192
*
193-
* @beta
193+
* @internal
194194
*/
195195
export function translateJsonSchemaEx(
196196
restApi: apigateway.IRestApi,

src/models.ts

Lines changed: 27 additions & 91 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { JsonSchemaEx } from './json-schema-ex';
77

88
/**
99
* {@link https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_apigateway.RestApi.html | aws_apigateway.RestApi}
10-
* augmented with the features to build the OpenAPI specification.
10+
* augmented with the features to build the OpenAPI definition.
1111
*
1212
* @beta
1313
*/
@@ -21,29 +21,19 @@ export interface IRestApiWithSpec extends apigateway.RestApi {
2121
*
2222
* If you directly change this object, the {@link IRestApiWithSpec} instance
2323
* cannot sync with your updates.
24-
*
25-
* @beta
2624
*/
2725
underlying: apigateway.RestApi;
2826

29-
/**
30-
* Root resource ('/') with the features to build the OpenAPI specification.
31-
*
32-
* @beta
33-
*/
27+
/** Root resource ('/') with the features to build the OpenAPI definition. */
3428
root: IBaseResourceWithSpec;
3529

36-
/**
37-
* Adds a new model.
38-
*
39-
* @beta
40-
*/
30+
/** Adds a new model. */
4131
addModel(id: string, props: ModelOptionsWithSpec): apigateway.Model;
4232
}
4333

4434
/**
4535
* {@link https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_apigateway.IResource.html | aws_apigateway.IResource}
46-
* augmented with the features to build the OpenAPI specification.
36+
* augmented with the features to build the OpenAPI definition.
4737
*
4838
* @remarks
4939
*
@@ -58,11 +48,7 @@ export interface IRestApiWithSpec extends apigateway.RestApi {
5848
* @beta
5949
*/
6050
export interface IBaseResourceWithSpec extends apigateway.IResource {
61-
/**
62-
* Default method options with the OpenAPI specification.
63-
*
64-
* @beta
65-
*/
51+
/** Default method options with the OpenAPI definition. */
6652
defaultMethodOptions?: MethodOptionsWithSpec;
6753

6854
/**
@@ -71,26 +57,16 @@ export interface IBaseResourceWithSpec extends apigateway.IResource {
7157
* @remarks
7258
*
7359
* `undefined` if this resource represents the root.
74-
*
75-
* @beta
7660
*/
7761
parentResource?: IBaseResourceWithSpec;
7862

79-
/**
80-
* Adds a new child resource with the OpenAPI specification.
81-
*
82-
* @beta
83-
*/
63+
/** Adds a new child resource with the OpenAPI definition. */
8464
addResource(
8565
pathPart: string,
8666
options?: ResourceOptionsWithSpec,
8767
): IResourceWithSpec;
8868

89-
/**
90-
* Adds a method with the OpenAPI specification.
91-
*
92-
* @beta
93-
*/
69+
/** Adds a method with the OpenAPI definition. */
9470
addMethod(
9571
httpMethod: string,
9672
target?: apigateway.Integration,
@@ -100,16 +76,12 @@ export interface IBaseResourceWithSpec extends apigateway.IResource {
10076

10177
/**
10278
* {@link https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_apigateway.Resource.html | aws_apigateway.Resource}
103-
* augmented with the features to build the OpenAPI specification.
79+
* augmented with the features to build the OpenAPI definition.
10480
*
10581
* @beta
10682
*/
10783
export interface IResourceWithSpec extends apigateway.Resource {
108-
/**
109-
* Default method options with the OpenAPI specification.
110-
*
111-
* @beta
112-
*/
84+
/** Default method options with the OpenAPI definition. */
11385
defaultMethodOptions?: MethodOptionsWithSpec;
11486

11587
/**
@@ -118,26 +90,16 @@ export interface IResourceWithSpec extends apigateway.Resource {
11890
* @remarks
11991
*
12092
* `undefined` if this resource is the root.
121-
*
122-
* @beta
12393
*/
12494
parentResource?: IBaseResourceWithSpec;
12595

126-
/**
127-
* Adds a new child resource with the OpenAPI specification.
128-
*
129-
* @beta
130-
*/
96+
/** Adds a new child resource with the OpenAPI definition. */
13197
addResource(
13298
pathPart: string,
13399
options?: ResourceOptionsWithSpec,
134100
): IResourceWithSpec;
135101

136-
/**
137-
* Adds a method with the OpenAPI specification.
138-
*
139-
* @beta
140-
*/
102+
/** Adds a method with the OpenAPI definition. */
141103
addMethod(
142104
httpMethod: string,
143105
target?: apigateway.Integration,
@@ -147,7 +109,7 @@ export interface IResourceWithSpec extends apigateway.Resource {
147109

148110
/**
149111
* {@link https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_apigateway.ModelOptions.html | aws_apigateway.ModelOptions}
150-
* augmented with the properties necessary to build the OpenAPI specification.
112+
* augmented with the properties necessary to build the OpenAPI definition.
151113
*
152114
* @remarks
153115
*
@@ -156,48 +118,36 @@ export interface IResourceWithSpec extends apigateway.Resource {
156118
* @beta
157119
*/
158120
export interface ModelOptionsWithSpec extends apigateway.ModelOptions {
159-
/**
160-
* Extended schema definition.
161-
*
162-
* @beta
163-
*/
121+
/** Extended schema definition. */
164122
schema: JsonSchemaEx;
165123
}
166124

167125
/**
168126
* {@link https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_apigateway.ResourceOptions.html | aws_apigateway.ResourceOptions}
169-
* augmented with the properties necessary to build the OpenAPI specification.
127+
* augmented with the properties necessary to build the OpenAPI definition.
170128
*
171129
* @beta
172130
*/
173131
export interface ResourceOptionsWithSpec extends apigateway.ResourceOptions {
174-
/**
175-
* Default method options with the OpenAPI specification.
176-
*
177-
* @beta
178-
*/
132+
/** Default method options with the OpenAPI definition. */
179133
defaultMethodOptions?: MethodOptionsWithSpec;
180134
}
181135

182136
/**
183137
* {@link https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_apigateway.MethodOptions.html | aws_apigateway.MethodOptions}
184-
* augmented with the properties necessary to build the OpenAPI specification.
138+
* augmented with the properties necessary to build the OpenAPI definition.
185139
*
186140
* @remarks
187141
*
188142
* {@link https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_apigateway.MethodOptions.html#operationname | operationName}
189143
* corresponds to
190144
* {@link https://spec.openapis.org/oas/latest.html#operation-object | paths[path][method].operationId}
191-
* in the OpenAPI specification.
145+
* in the OpenAPI definition.
192146
*
193147
* @beta
194148
*/
195149
export interface MethodOptionsWithSpec extends apigateway.MethodOptions {
196-
/**
197-
* Authorizer augmented with the OpenAPI specification.
198-
*
199-
* @beta
200-
*/
150+
/** Authorizer augmented with the OpenAPI definition. */
201151
authorizer?: IAuthorizerWithSpec;
202152
/**
203153
* Summary of the method.
@@ -206,9 +156,7 @@ export interface MethodOptionsWithSpec extends apigateway.MethodOptions {
206156
*
207157
* Corresponds to
208158
* {@link https://spec.openapis.org/oas/latest.html#operation-object | paths[path][method].summary}
209-
* in the OpenAPI specification.
210-
*
211-
* @beta
159+
* in the OpenAPI definition.
212160
*/
213161
summary?: string;
214162
/**
@@ -218,20 +166,18 @@ export interface MethodOptionsWithSpec extends apigateway.MethodOptions {
218166
*
219167
* Corresponds to
220168
* {@link https://spec.openapis.org/oas/latest.html#operation-object | paths[path][method].description}
221-
* in the OpenAPI specification.
222-
*
223-
* @beta
169+
* in the OpenAPI definition.
224170
*/
225171
description?: string;
226172
/**
227-
* Request parameters which maps parameter objects for the OpenAPI
228-
* specification instead of boolean values.
173+
* Request parameters which maps parameter objects for the OpenAPI definition
174+
* instead of boolean values.
229175
*
230176
* @remarks
231177
*
232178
* Corresponds to
233179
* {@link https://spec.openapis.org/oas/latest.html#operation-object | paths[path][method].parameters}
234-
* in the OpenAPI specification.
180+
* in the OpenAPI definition.
235181
*
236182
* Possible keys are the same as those of
237183
* {@link https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_apigateway.MethodOptions.html#requestparameters | requestParameters};
@@ -244,7 +190,7 @@ export interface MethodOptionsWithSpec extends apigateway.MethodOptions {
244190
* ```
245191
*
246192
* A key represents the following properties of the parameter object of the
247-
* OpenAPI specification,
193+
* OpenAPI definition,
248194
*
249195
* ```
250196
* - name = <parameter-name>
@@ -262,31 +208,23 @@ export interface MethodOptionsWithSpec extends apigateway.MethodOptions {
262208
* {@link https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_apigateway.MethodOptions.html#requestparameters | requestParameters}
263209
* and `requestParameterSchemas` are specified, `requestParameterSchemas`
264210
* precedes.
265-
*
266-
* @beta
267211
*/
268212
requestParameterSchemas?: { [key: string]: BaseParameterObject };
269213
/**
270214
* Method responses augmented with properties necessary for the OpenAPI
271-
* specification.
272-
*
273-
* @beta
215+
* definition.
274216
*/
275217
methodResponses?: MethodResponseWithSpec[],
276218
}
277219

278220
/**
279221
* {@link https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_apigateway.MethodResponse.html | aws_apigateway.MethodResponse}
280-
* augmented with properties necessary for the OpenAPI specification.
222+
* augmented with properties necessary for the OpenAPI definition.
281223
*
282224
* @beta
283225
*/
284226
export interface MethodResponseWithSpec extends apigateway.MethodResponse {
285-
/**
286-
* Description of the response.
287-
*
288-
* @beta
289-
*/
227+
/** Description of the response. */
290228
description?: string;
291229
}
292230

@@ -337,8 +275,6 @@ export class ParameterKey {
337275
* @throws RangeError
338276
*
339277
* If `key` is not a valid parameter key.
340-
*
341-
* @beta
342278
*/
343279
static parseParameterKey(key: string): ParameterKey {
344280
const match = key.match(/^method\.(request|response)\.(path|querystring|multivaluequerystring|header|multivalueheader)\.(.+)/);

0 commit comments

Comments
 (0)