Skip to content

Commit 923c418

Browse files
committed
chore(lint): fix noAccumulatingSpread rule and remove from config
1 parent 0698f81 commit 923c418

File tree

8 files changed

+58
-44
lines changed

8 files changed

+58
-44
lines changed

biome.jsonc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,7 @@
3232
"noBannedTypes": "warn"
3333
},
3434
"performance": {
35-
"noDelete": "warn",
36-
"noAccumulatingSpread": "warn"
35+
"noDelete": "warn"
3736
}
3837
}
3938
},

examples/sst/stacks/OpenNextReferenceImplementation.ts

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -391,26 +391,24 @@ export class OpenNextCdkReferenceImplementation extends Construct {
391391
.filter((b) => b.pattern !== "*")
392392
.reduce(
393393
(acc, behavior) => {
394-
return {
395-
...acc,
396-
[behavior.pattern]: {
397-
origin: behavior.origin
398-
? origins[behavior.origin]
399-
: origins.default,
400-
viewerProtocolPolicy: ViewerProtocolPolicy.REDIRECT_TO_HTTPS,
401-
allowedMethods: AllowedMethods.ALLOW_GET_HEAD_OPTIONS,
402-
cachedMethods: CachedMethods.CACHE_GET_HEAD_OPTIONS,
403-
cachePolicy:
404-
behavior.origin === "s3"
405-
? this.staticCachePolicy
406-
: this.serverCachePolicy,
407-
originRequestPolicy:
408-
behavior.origin === "s3"
409-
? undefined
410-
: OriginRequestPolicy.ALL_VIEWER_EXCEPT_HOST_HEADER,
411-
functionAssociations: fnAssociations,
412-
},
394+
acc[behavior.pattern] = {
395+
origin: behavior.origin
396+
? origins[behavior.origin]
397+
: origins.default,
398+
viewerProtocolPolicy: ViewerProtocolPolicy.REDIRECT_TO_HTTPS,
399+
allowedMethods: AllowedMethods.ALLOW_GET_HEAD_OPTIONS,
400+
cachedMethods: CachedMethods.CACHE_GET_HEAD_OPTIONS,
401+
cachePolicy:
402+
behavior.origin === "s3"
403+
? this.staticCachePolicy
404+
: this.serverCachePolicy,
405+
originRequestPolicy:
406+
behavior.origin === "s3"
407+
? undefined
408+
: OriginRequestPolicy.ALL_VIEWER_EXCEPT_HOST_HEADER,
409+
functionAssociations: fnAssociations,
413410
};
411+
return acc;
414412
},
415413
{} as Record<string, BehaviorOptions>,
416414
),

packages/open-next/src/core/requestHandler.ts

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -55,15 +55,19 @@ export async function openNextHandler(
5555
"type" in preprocessResult
5656
? preprocessResult.headers
5757
: preprocessResult.internalEvent.headers,
58-
).reduce((acc, [key, value]) => {
59-
if (!key.startsWith("x-middleware-response-")) {
58+
).reduce(
59+
(acc, [key, value]) => {
60+
if (!key.startsWith("x-middleware-response-")) {
61+
return acc;
62+
}
63+
const newKey = key.replace("x-middleware-response-", "");
64+
delete headers[key];
65+
headers[newKey] = value;
66+
acc[newKey] = value;
6067
return acc;
61-
}
62-
const newKey = key.replace("x-middleware-response-", "");
63-
delete headers[key];
64-
headers[newKey] = value;
65-
return { ...acc, [newKey]: value };
66-
}, {});
68+
},
69+
{} as Record<string, string | string[]>,
70+
);
6771

6872
if ("type" in preprocessResult) {
6973
// // res is used only in the streaming case

packages/open-next/src/core/routing/matcher.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -214,11 +214,11 @@ export function handleRewrites<T extends RewriteDefinition>(
214214
),
215215
// params for the has
216216
...rewrite.has?.reduce((acc, cur) => {
217-
return { ...acc, ...computeHas(cur) };
217+
return Object.assign(acc, computeHas(cur));
218218
}, {}),
219219
// params for the missing
220220
...rewrite.missing?.reduce((acc, cur) => {
221-
return { ...acc, ...computeHas(cur) };
221+
return Object.assign(acc, computeHas(cur));
222222
}, {}),
223223
};
224224
const isUsingParams = Object.keys(params).length > 0;

packages/open-next/src/core/routing/util.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@ export function convertFromQueryString(query: string) {
3131
return queryParts.reduce(
3232
(acc, part) => {
3333
const [key, value] = part.split("=");
34-
return { ...acc, [key]: value };
34+
acc[key] = value;
35+
return acc;
3536
},
3637
{} as Record<string, string>,
3738
);

packages/open-next/src/overrides/converters/aws-apigw-v1.ts

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,14 @@ async function convertFromAPIGatewayProxyEvent(
6969
event.multiValueQueryStringParameters ?? {},
7070
),
7171
cookies:
72-
event.multiValueHeaders?.cookie?.reduce((acc, cur) => {
73-
const [key, value] = cur.split("=");
74-
return { ...acc, [key]: value };
75-
}, {}) ?? {},
72+
event.multiValueHeaders?.cookie?.reduce(
73+
(acc, cur) => {
74+
const [key, value] = cur.split("=");
75+
acc[key] = value;
76+
return acc;
77+
},
78+
{} as Record<string, string>,
79+
) ?? {},
7680
};
7781
}
7882

packages/open-next/src/overrides/converters/aws-apigw-v2.ts

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,10 +84,14 @@ async function convertFromAPIGatewayProxyEventV2(
8484
remoteAddress: requestContext.http.sourceIp,
8585
query: removeUndefinedFromQuery(convertToQuery(rawQueryString)),
8686
cookies:
87-
event.cookies?.reduce((acc, cur) => {
88-
const [key, value] = cur.split("=");
89-
return { ...acc, [key]: value };
90-
}, {}) ?? {},
87+
event.cookies?.reduce(
88+
(acc, cur) => {
89+
const [key, value] = cur.split("=");
90+
acc[key] = value;
91+
return acc;
92+
},
93+
{} as Record<string, string>,
94+
) ?? {},
9195
};
9296
}
9397

packages/open-next/src/overrides/converters/aws-cloudfront.ts

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -101,10 +101,14 @@ async function convertFromCloudFrontRequestEvent(
101101
remoteAddress: clientIp,
102102
query: convertToQuery(querystring),
103103
cookies:
104-
headers.cookie?.reduce((acc, cur) => {
105-
const { key, value } = cur;
106-
return { ...acc, [key ?? ""]: value };
107-
}, {}) ?? {},
104+
headers.cookie?.reduce(
105+
(acc, cur) => {
106+
const { key = "", value } = cur;
107+
acc[key] = value;
108+
return acc;
109+
},
110+
{} as Record<string, string>,
111+
) ?? {},
108112
};
109113
}
110114

0 commit comments

Comments
 (0)