Skip to content

Commit 09f0aaa

Browse files
authored
feat(parser): provide sub-path exports (#3598)
1 parent 2a9bf0f commit 09f0aaa

25 files changed

+95
-163
lines changed

Diff for: packages/parser/package.json

+10-120
Original file line numberDiff line numberDiff line change
@@ -124,61 +124,9 @@
124124
"require": "./lib/cjs/schemas/vpc-latticev2.js",
125125
"import": "./lib/esm/schemas/vpc-latticev2.js"
126126
},
127-
"./envelopes": {
128-
"require": "./lib/cjs/envelopes/index.js",
129-
"import": "./lib/esm/envelopes/index.js"
130-
},
131-
"./envelopes/api-gateway": {
132-
"require": "./lib/cjs/envelopes/apigw.js",
133-
"import": "./lib/esm/envelopes/apigw.js"
134-
},
135-
"./envelopes/api-gatewayv2": {
136-
"require": "./lib/cjs/envelopes/apigwv2.js",
137-
"import": "./lib/esm/envelopes/apigwv2.js"
138-
},
139-
"./envelopes/cloudwatch": {
140-
"require": "./lib/cjs/envelopes/cloudwatch.js",
141-
"import": "./lib/esm/envelopes/cloudwatch.js"
142-
},
143-
"./envelopes/dynamodb": {
144-
"require": "./lib/cjs/envelopes/dynamodb.js",
145-
"import": "./lib/esm/envelopes/dynamodb.js"
146-
},
147-
"./envelopes/eventbridge": {
148-
"require": "./lib/cjs/envelopes/eventbridge.js",
149-
"import": "./lib/esm/envelopes/eventbridge.js"
150-
},
151-
"./envelopes/kafka": {
152-
"require": "./lib/cjs/envelopes/kafka.js",
153-
"import": "./lib/esm/envelopes/kafka.js"
154-
},
155-
"./envelopes/kinesis": {
156-
"require": "./lib/cjs/envelopes/kinesis.js",
157-
"import": "./lib/esm/envelopes/kinesis.js"
158-
},
159-
"./envelopes/kinesis-firehose": {
160-
"require": "./lib/cjs/envelopes/kinesis-firehose.js",
161-
"import": "./lib/esm/envelopes/kinesis-firehose.js"
162-
},
163-
"./envelopes/lambda": {
164-
"require": "./lib/cjs/envelopes/lambda.js",
165-
"import": "./lib/esm/envelopes/lambda.js"
166-
},
167-
"./envelopes/sns": {
168-
"require": "./lib/cjs/envelopes/sns.js",
169-
"import": "./lib/esm/envelopes/sns.js"
170-
},
171-
"./envelopes/sqs": {
172-
"require": "./lib/cjs/envelopes/sqs.js",
173-
"import": "./lib/esm/envelopes/sqs.js"
174-
},
175-
"./envelopes/vpc-lattice": {
176-
"require": "./lib/cjs/envelopes/vpc-lattice.js",
177-
"import": "./lib/esm/envelopes/vpc-lattice.js"
178-
},
179-
"./envelopes/vpc-latticev2": {
180-
"require": "./lib/cjs/envelopes/vpc-latticev2.js",
181-
"import": "./lib/esm/envelopes/vpc-latticev2.js"
127+
"./envelopes/*.ts": {
128+
"require": "./lib/cjs/envelopes/*.js",
129+
"import": "./lib/esm/envelopes/*.js"
182130
},
183131
"./helpers": {
184132
"require": "./lib/cjs/helpers.js",
@@ -196,7 +144,7 @@
196144
"typesVersions": {
197145
"*": {
198146
"types": [
199-
"./lib/cjs/types/index.d.ts",
147+
"./lib/cjs/types/index.d.ts",
200148
"./lib/esm/types/index.d.ts"
201149
],
202150
"middleware": [
@@ -256,7 +204,7 @@
256204
"./lib/esm/schemas/lambda.d.ts"
257205
],
258206
"schemas/s3": [
259-
"./lib/cjs/schemas/s3.d.ts",
207+
"./lib/cjs/schemas/s3.d.ts",
260208
"./lib/esm/schemas/s3.d.ts"
261209
],
262210
"schemas/ses": [
@@ -279,77 +227,19 @@
279227
"./lib/cjs/schemas/vpc-latticev2.d.ts",
280228
"./lib/esm/schemas/vpc-latticev2.d.ts"
281229
],
282-
"envelopes": [
283-
"./lib/cjs/envelopes/index.d.ts",
284-
"./lib/esm/envelopes/index.d.ts"
285-
],
286-
"envelopes/api-gateway": [
287-
"./lib/cjs/envelopes/apigw.d.ts",
288-
"./lib/esm/envelopes/apigw.d.ts"
289-
],
290-
"envelopes/api-gatewayv2": [
291-
"./lib/cjs/envelopes/apigwv2.d.ts",
292-
"./lib/esm/envelopes/apigwv2.d.ts"
293-
],
294-
"envelopes/cloudwatch": [
295-
"./lib/cjs/envelopes/cloudwatch.d.ts",
296-
"./lib/esm/envelopes/cloudwatch.d.ts"
297-
],
298-
"envelopes/dynamodb": [
299-
"./lib/cjs/envelopes/dynamodb.d.ts",
300-
"./lib/esm/envelopes/dynamodb.d.ts"
301-
],
302-
"envelopes/eventbridge": [
303-
"./lib/cjs/envelopes/eventbridge.d.ts",
304-
"./lib/esm/envelopes/eventbridge.d.ts"
305-
],
306-
"envelopes/kafka": [
307-
"./lib/cjs/envelopes/kafka.d.ts",
308-
"./lib/esm/envelopes/kafka.d.ts"
309-
],
310-
"envelopes/kinesis": [
311-
"./lib/cjs/envelopes/kinesis.d.ts",
312-
"./lib/esm/envelopes/kinesis.d.ts"
313-
],
314-
"envelopes/kinesis-firehose": [
315-
"./lib/cjs/envelopes/kinesis-firehose.d.ts",
316-
"./lib/esm/envelopes/kinesis-firehose.d.ts"
317-
],
318-
"envelopes/lambda": [
319-
"./lib/cjs/envelopes/lambda.d.ts",
320-
"./lib/esm/envelopes/lambda.d.ts"
321-
],
322-
"envelopes/sns": [
323-
"./lib/cjs/envelopes/sns.d.ts",
324-
"./lib/esm/envelopes/sns.d.ts"
325-
],
326-
"envelopes/sqs": [
327-
"./lib/cjs/envelopes/sqs.d.ts",
328-
"./lib/esm/envelopes/sqs.d.ts"
329-
],
330-
"schemas/transfer-family": [
331-
"./lib/cjs/schemas/transfer-family.d.ts",
332-
"./lib/esm/schemas/transfer-family.d.ts"
333-
],
334-
"envelopes/vpc-lattice": [
335-
"./lib/cjs/envelopes/vpc-lattice.d.ts",
336-
"./lib/esm/envelopes/vpc-lattice.d.ts"
337-
],
338-
"envelopes/vpc-latticev2": [
339-
"./lib/cjs/envelopes/vpc-latticev2.d.ts",
340-
"./lib/esm/envelopes/vpc-latticev2.d.ts"
230+
"envelopes/*.ts": [
231+
"./lib/cjs/envelopes/*.d.ts",
232+
"./lib/esm/envelopes/*.d.ts"
341233
],
342234
"helpers": [
343-
"./lib/cjs/helpers.d.ts",
235+
"./lib/cjs/helpers.d.ts",
344236
"./lib/esm/helpers.d.ts"
345237
]
346238
}
347239
},
348240
"main": "./lib/cjs/index.js",
349241
"types": "./lib/cjs/index.d.ts",
350-
"files": [
351-
"lib"
352-
],
242+
"files": ["lib"],
353243
"repository": {
354244
"type": "git",
355245
"url": "git+https://github.com/aws-powertools/powertools-lambda-typescript.git"

Diff for: packages/parser/src/envelopes/index.ts

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
export { ApiGatewayEnvelope } from './apigw.js';
2-
export { ApiGatewayV2Envelope } from './apigwv2.js';
1+
export { ApiGatewayEnvelope } from './api-gateway.js';
2+
export { ApiGatewayV2Envelope } from './api-gatewayv2.js';
33
export { CloudWatchEnvelope } from './cloudwatch.js';
44
export { DynamoDBStreamEnvelope } from './dynamodb.js';
5-
export { EventBridgeEnvelope } from './event-bridge.js';
5+
export { EventBridgeEnvelope } from './eventbridge.js';
66
export { KafkaEnvelope } from './kafka.js';
7-
export { KinesisEnvelope } from './kinesis.js';
87
export { KinesisFirehoseEnvelope } from './kinesis-firehose.js';
8+
export { KinesisEnvelope } from './kinesis.js';
99
export { LambdaFunctionUrlEnvelope } from './lambda.js';
10+
export { SnsSqsEnvelope } from './sns-sqs.js';
1011
export { SnsEnvelope } from './sns.js';
1112
export { SqsEnvelope } from './sqs.js';
12-
export { SnsSqsEnvelope } from './snssqs.js';
1313
export { VpcLatticeEnvelope } from './vpc-lattice.js';
1414
export { VpcLatticeV2Envelope } from './vpc-latticev2.js';
File renamed without changes.

Diff for: packages/parser/src/types/index.ts

+13
Original file line numberDiff line numberDiff line change
@@ -10,34 +10,47 @@ export type { Envelope } from './envelope.js';
1010
export type {
1111
ALBEvent,
1212
ALBMultiValueHeadersEvent,
13+
APIGatewayEventRequestContext,
1314
APIGatewayProxyEvent,
1415
APIGatewayProxyEventV2,
16+
APIGatewayRequestAuthorizerEvent,
1517
APIGatewayRequestAuthorizerV2,
1618
APIGatewayRequestContextV2,
19+
APIGatewayTokenAuthorizerEvent,
1720
AppSyncBatchResolverEvent,
1821
AppSyncResolverEvent,
1922
CloudFormationCustomResourceCreateEvent,
2023
CloudFormationCustomResourceDeleteEvent,
2124
CloudFormationCustomResourceUpdateEvent,
25+
CloudWatchLogEvent,
26+
CloudWatchLogsDecode,
2227
CloudWatchLogsEvent,
2328
DynamoDBStreamEvent,
2429
DynamoDBStreamToKinesisRecordEvent,
2530
EventBridgeEvent,
2631
KafkaMskEvent,
32+
KafkaRecord,
2733
KafkaSelfManagedEvent,
2834
KinesisDataStreamEvent,
35+
KinesisDataStreamRecordEvent,
2936
KinesisDynamoDBStreamEvent,
3037
KinesisFireHoseEvent,
38+
KinesisFirehoseRecord,
3139
KinesisFireHoseSqsEvent,
40+
KinesisFirehoseSqsRecord,
3241
LambdaFunctionUrlEvent,
3342
S3Event,
3443
S3EventNotificationEventBridge,
3544
S3ObjectLambdaEvent,
3645
S3SqsEventNotification,
3746
SesEvent,
47+
SesRecord,
3848
SnsEvent,
49+
SnsNotification,
50+
SnsRecord,
3951
SnsSqsNotification,
4052
SqsEvent,
53+
SqsRecord,
4154
TransferFamilyEvent,
4255
VpcLatticeEvent,
4356
VpcLatticeEventV2,

Diff for: packages/parser/src/types/schema.ts

+35-5
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,29 @@
11
import type { z } from 'zod';
22
import type {
3+
APIGatewayEventRequestContextSchema,
34
APIGatewayProxyEventSchema,
45
APIGatewayProxyEventV2Schema,
6+
APIGatewayRequestAuthorizerEventSchema,
57
APIGatewayRequestAuthorizerV2Schema,
68
APIGatewayRequestContextV2Schema,
9+
APIGatewayTokenAuthorizerEventSchema,
710
AlbMultiValueHeadersSchema,
811
AlbSchema,
912
AppSyncBatchResolverSchema,
1013
AppSyncResolverSchema,
1114
CloudFormationCustomResourceCreateSchema,
1215
CloudFormationCustomResourceDeleteSchema,
1316
CloudFormationCustomResourceUpdateSchema,
17+
CloudWatchLogEventSchema,
18+
CloudWatchLogsDecodeSchema,
1419
CloudWatchLogsSchema,
1520
DynamoDBStreamSchema,
1621
DynamoDBStreamToKinesisRecord,
1722
EventBridgeSchema,
1823
KafkaMskEventSchema,
1924
KafkaRecordSchema,
2025
KafkaSelfManagedEventSchema,
26+
KinesisDataStreamRecord,
2127
KinesisDataStreamSchema,
2228
KinesisDynamoDBStreamSchema,
2329
KinesisFirehoseRecordSchema,
@@ -48,6 +54,18 @@ type ALBMultiValueHeadersEvent = z.infer<typeof AlbMultiValueHeadersSchema>;
4854

4955
type APIGatewayProxyEvent = z.infer<typeof APIGatewayProxyEventSchema>;
5056

57+
type APIGatewayRequestAuthorizerEvent = z.infer<
58+
typeof APIGatewayRequestAuthorizerEventSchema
59+
>;
60+
61+
type APIGatewayTokenAuthorizerEvent = z.infer<
62+
typeof APIGatewayTokenAuthorizerEventSchema
63+
>;
64+
65+
type APIGatewayEventRequestContext = z.infer<
66+
typeof APIGatewayEventRequestContextSchema
67+
>;
68+
5169
type APIGatewayProxyEventV2 = z.infer<typeof APIGatewayProxyEventV2Schema>;
5270

5371
type APIGatewayRequestAuthorizerV2 = z.infer<
@@ -62,6 +80,10 @@ type AppSyncResolverEvent = z.infer<typeof AppSyncResolverSchema>;
6280

6381
type AppSyncBatchResolverEvent = z.infer<typeof AppSyncBatchResolverSchema>;
6482

83+
type CloudWatchLogEvent = z.infer<typeof CloudWatchLogEventSchema>;
84+
85+
type CloudWatchLogsDecode = z.infer<typeof CloudWatchLogsDecodeSchema>;
86+
6587
type CloudFormationCustomResourceCreateEvent = z.infer<
6688
typeof CloudFormationCustomResourceCreateSchema
6789
>;
@@ -94,6 +116,8 @@ type KinesisDataStreamEvent = z.infer<typeof KinesisDataStreamSchema>;
94116

95117
type KinesisDynamoDBStreamEvent = z.infer<typeof KinesisDynamoDBStreamSchema>;
96118

119+
type KinesisDataStreamRecordEvent = z.infer<typeof KinesisDataStreamRecord>;
120+
97121
type KinesisFireHoseEvent = z.infer<typeof KinesisFirehoseSchema>;
98122

99123
type KinesisFirehoseRecord = z.infer<typeof KinesisFirehoseRecordSchema>;
@@ -139,39 +163,45 @@ type VpcLatticeEventV2 = z.infer<typeof VpcLatticeV2Schema>;
139163
export type {
140164
ALBEvent,
141165
ALBMultiValueHeadersEvent,
166+
APIGatewayEventRequestContext,
142167
APIGatewayProxyEvent,
143168
APIGatewayProxyEventV2,
169+
APIGatewayRequestAuthorizerEvent,
144170
APIGatewayRequestAuthorizerV2,
145171
APIGatewayRequestContextV2,
146-
AppSyncResolverEvent,
172+
APIGatewayTokenAuthorizerEvent,
147173
AppSyncBatchResolverEvent,
174+
AppSyncResolverEvent,
148175
CloudFormationCustomResourceCreateEvent,
149176
CloudFormationCustomResourceDeleteEvent,
150177
CloudFormationCustomResourceUpdateEvent,
178+
CloudWatchLogEvent,
179+
CloudWatchLogsDecode,
151180
CloudWatchLogsEvent,
152181
DynamoDBStreamEvent,
153182
DynamoDBStreamToKinesisRecordEvent,
154183
EventBridgeEvent,
155-
KafkaSelfManagedEvent,
156184
KafkaMskEvent,
157185
KafkaRecord,
186+
KafkaSelfManagedEvent,
158187
KinesisDataStreamEvent,
188+
KinesisDataStreamRecordEvent,
159189
KinesisDynamoDBStreamEvent,
160190
KinesisFireHoseEvent,
161-
KinesisFirehoseRecord,
162191
KinesisFireHoseSqsEvent,
192+
KinesisFirehoseRecord,
163193
KinesisFirehoseSqsRecord,
164194
LambdaFunctionUrlEvent,
165195
S3Event,
166196
S3EventNotificationEventBridge,
167-
S3SqsEventNotification,
168197
S3ObjectLambdaEvent,
198+
S3SqsEventNotification,
169199
SesEvent,
170200
SesRecord,
171201
SnsEvent,
172-
SnsSqsNotification,
173202
SnsNotification,
174203
SnsRecord,
204+
SnsSqsNotification,
175205
SqsEvent,
176206
SqsRecord,
177207
TransferFamilyEvent,

Diff for: packages/parser/tests/types/envelopes.test.ts

+14-16
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,19 @@
11
import { describe, expect, expectTypeOf, it } from 'vitest';
22
import { z } from 'zod';
3-
import {
4-
ApiGatewayEnvelope,
5-
ApiGatewayV2Envelope,
6-
CloudWatchEnvelope,
7-
DynamoDBStreamEnvelope,
8-
EventBridgeEnvelope,
9-
KafkaEnvelope,
10-
KinesisEnvelope,
11-
KinesisFirehoseEnvelope,
12-
LambdaFunctionUrlEnvelope,
13-
SnsEnvelope,
14-
SnsSqsEnvelope,
15-
SqsEnvelope,
16-
VpcLatticeEnvelope,
17-
VpcLatticeV2Envelope,
18-
} from '../../src/envelopes/index.js';
3+
import { ApiGatewayEnvelope } from '../../src/envelopes/api-gateway.js';
4+
import { ApiGatewayV2Envelope } from '../../src/envelopes/api-gatewayv2.js';
5+
import { CloudWatchEnvelope } from '../../src/envelopes/cloudwatch.js';
6+
import { DynamoDBStreamEnvelope } from '../../src/envelopes/dynamodb.js';
7+
import { EventBridgeEnvelope } from '../../src/envelopes/eventbridge.js';
8+
import { KafkaEnvelope } from '../../src/envelopes/kafka.js';
9+
import { KinesisFirehoseEnvelope } from '../../src/envelopes/kinesis-firehose.js';
10+
import { KinesisEnvelope } from '../../src/envelopes/kinesis.js';
11+
import { LambdaFunctionUrlEnvelope } from '../../src/envelopes/lambda.js';
12+
import { SnsSqsEnvelope } from '../../src/envelopes/sns-sqs.js';
13+
import { SnsEnvelope } from '../../src/envelopes/sns.js';
14+
import { SqsEnvelope } from '../../src/envelopes/sqs.js';
15+
import { VpcLatticeEnvelope } from '../../src/envelopes/vpc-lattice.js';
16+
import { VpcLatticeV2Envelope } from '../../src/envelopes/vpc-latticev2.js';
1917
import type { ParserOutput } from '../../src/types/parser.js';
2018

2119
describe('Types ', () => {

Diff for: packages/parser/tests/types/parser.test.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
import { describe } from 'node:test';
22
import { expect, expectTypeOf, it } from 'vitest';
33
import { z } from 'zod';
4-
import { EventBridgeEnvelope, SqsEnvelope } from '../../src/envelopes/index.js';
4+
import { EventBridgeEnvelope } from '../../src/envelopes/eventbridge.js';
5+
import { SqsEnvelope } from '../../src/envelopes/sqs.js';
56
import { parse } from '../../src/parser.js';
67
import type { EventBridgeEvent, SqsEvent } from '../../src/types/schema.js';
78
import { getTestEvent } from '../unit/helpers/utils.js';

0 commit comments

Comments
 (0)