Skip to content

Commit 6256694

Browse files
authored
fix intersection types breaking docs generation (#6401)
1 parent 1d92028 commit 6256694

File tree

3 files changed

+27
-23
lines changed

3 files changed

+27
-23
lines changed

platform/src/components/aws/nextjs.ts

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ import { Queue } from "./queue.js";
99
import { dynamodb, getRegionOutput, lambda } from "@pulumi/aws";
1010
import { isALteB } from "../../util/compare-semver.js";
1111
import { Plan, SsrSite, SsrSiteArgs } from "./ssr-site.js";
12-
import { Bucket } from "./bucket.js";
12+
import { Bucket, BucketArgs } from "./bucket.js";
13+
import { CdnArgs } from "./cdn.js";
1314
import { transform, Transform } from "../component.js";
1415

1516
const DEFAULT_OPEN_NEXT_VERSION = "3.9.8";
@@ -479,7 +480,23 @@ export interface NextjsArgs extends SsrSiteArgs {
479480
* [Transform](/docs/components#transform) how this component creates its underlying
480481
* resources.
481482
*/
482-
transform?: SsrSiteArgs["transform"] & {
483+
transform?: {
484+
/**
485+
* Transform the Bucket resource used for uploading the assets.
486+
*/
487+
assets?: Transform<BucketArgs>;
488+
/**
489+
* Transform the server Function resource.
490+
*/
491+
server?: Transform<FunctionArgs>;
492+
/**
493+
* Transform the image optimizer Function resource.
494+
*/
495+
imageOptimizer?: Transform<FunctionArgs>;
496+
/**
497+
* Transform the CloudFront CDN resource.
498+
*/
499+
cdn?: Transform<CdnArgs>;
483500
/**
484501
* Transform the revalidation seeder Function resource used for ISR.
485502
*/

platform/src/components/aws/queue-lambda-subscriber.ts

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,7 @@ export interface Args extends QueueSubscriberArgs {
3030
* [Transform](/docs/components#transform) how this component creates its underlying
3131
* resources.
3232
*/
33-
transform?: QueueSubscriberArgs["transform"] & {
34-
/**
35-
* Transform the subscriber Function resource.
36-
*/
37-
function?: Transform<FunctionArgs>;
38-
};
33+
transform?: QueueSubscriberArgs["transform"];
3934
}
4035

4136
/**

platform/src/components/aws/queue.ts

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -289,6 +289,10 @@ export interface QueueSubscriberArgs {
289289
* Transform the Lambda Event Source Mapping resource.
290290
*/
291291
eventSourceMapping?: Transform<lambda.EventSourceMappingArgs>;
292+
/**
293+
* Transform the subscriber Function resource.
294+
*/
295+
function?: Transform<FunctionArgs>;
292296
};
293297
}
294298

@@ -504,11 +508,7 @@ export class Queue extends Component implements Link.Linkable {
504508
*/
505509
public subscribe(
506510
subscriber: Input<string | FunctionArgs | FunctionArn>,
507-
args?: QueueSubscriberArgs & {
508-
transform?: QueueSubscriberArgs["transform"] & {
509-
function?: Transform<FunctionArgs>;
510-
};
511-
},
511+
args?: QueueSubscriberArgs,
512512
opts?: ComponentResourceOptions,
513513
) {
514514
if (this.isSubscribed)
@@ -573,11 +573,7 @@ export class Queue extends Component implements Link.Linkable {
573573
public static subscribe(
574574
queueArn: Input<string>,
575575
subscriber: Input<string | FunctionArgs | FunctionArn>,
576-
args?: QueueSubscriberArgs & {
577-
transform?: QueueSubscriberArgs["transform"] & {
578-
function?: Transform<FunctionArgs>;
579-
};
580-
},
576+
args?: QueueSubscriberArgs,
581577
opts?: ComponentResourceOptions,
582578
) {
583579
return output(queueArn).apply((queueArn) =>
@@ -595,11 +591,7 @@ export class Queue extends Component implements Link.Linkable {
595591
name: string,
596592
queueArn: Input<string>,
597593
subscriber: Input<string | FunctionArgs | FunctionArn>,
598-
args: QueueSubscriberArgs & {
599-
transform?: QueueSubscriberArgs["transform"] & {
600-
function?: Transform<FunctionArgs>;
601-
};
602-
} = {},
594+
args: QueueSubscriberArgs = {},
603595
opts?: ComponentResourceOptions,
604596
) {
605597
return output(queueArn).apply((queueArn) => {

0 commit comments

Comments
 (0)