prisma-generator-express 1.62.1 → 1.62.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/generators/generateRouter.js +54 -17
- package/dist/generators/generateRouter.js.map +1 -1
- package/dist/generators/generateRouterFastify.js +89 -18
- package/dist/generators/generateRouterFastify.js.map +1 -1
- package/dist/generators/generateRouterHono.js +89 -14
- package/dist/generators/generateRouterHono.js.map +1 -1
- package/dist/utils/copyFiles.js +1 -0
- package/dist/utils/copyFiles.js.map +1 -1
- package/package.json +1 -1
- package/src/copy/autoIncludeRuntimeGuarded.ts +3 -32
- package/src/copy/projectionDefaults.ts +473 -0
- package/src/generators/generateRouter.ts +55 -24
- package/src/generators/generateRouterFastify.ts +98 -20
- package/src/generators/generateRouterHono.ts +90 -14
- package/src/utils/copyFiles.ts +1 -0
|
@@ -18,14 +18,14 @@ function emitReadOp(meta, modelName) {
|
|
|
18
18
|
const postReadBlock = meta.supportsPostRead
|
|
19
19
|
? ` if (postReadsEnabled) {
|
|
20
20
|
const postPath = ${meta.name === 'findMany' ? "basePath ? `${basePath}/read` : '/read'" : `path`}
|
|
21
|
-
router.post(postPath, parseBodyAsQuery, setShape(opConfig), ...before, ${handlerName} as RequestHandler, ...after, respond)
|
|
21
|
+
router.post(postPath, parseBodyAsQuery, setShape(opConfig, 'read'), ...before, ${handlerName} as RequestHandler, ...after, respond)
|
|
22
22
|
}`
|
|
23
23
|
: '';
|
|
24
24
|
return ` if (isEnabled(config.${meta.configKey})) {
|
|
25
25
|
const opConfig: OperationConfigLike = (config.${meta.configKey} as OperationConfigLike | undefined) ?? defaultOpConfig
|
|
26
26
|
const { before = [], after = [] } = opConfig
|
|
27
27
|
const path = ${pathValue}
|
|
28
|
-
router.get(path, parseQuery, setShape(opConfig), ...before, maybeProgressiveSSE(opConfig, core.${meta.coreName}, '${meta.name}'), ${handlerName} as RequestHandler, ...after, respond)
|
|
28
|
+
router.get(path, parseQuery, setShape(opConfig, 'read'), ...before, maybeProgressiveSSE(opConfig, core.${meta.coreName}, '${meta.name}'), ${handlerName} as RequestHandler, ...after, respond)
|
|
29
29
|
${postReadBlock}
|
|
30
30
|
}`;
|
|
31
31
|
}
|
|
@@ -38,7 +38,7 @@ function emitWriteOp(meta, modelName) {
|
|
|
38
38
|
const opConfig: OperationConfigLike = (config.${meta.configKey} as OperationConfigLike | undefined) ?? defaultOpConfig
|
|
39
39
|
const { before = [], after = [] } = opConfig
|
|
40
40
|
const path = ${pathValue}
|
|
41
|
-
router.${meta.method}(path, setShape(opConfig), ...before, ${handlerName} as RequestHandler, ...after, ${respondFn})
|
|
41
|
+
router.${meta.method}(path, setShape(opConfig, 'write'), ...before, ${handlerName} as RequestHandler, ...after, ${respondFn})
|
|
42
42
|
}`;
|
|
43
43
|
}
|
|
44
44
|
function generateRouterFunction({ model, enums, guardShapesImport, importStyle, writeStrategy, findManyPaginatedMode, dropGuard, }) {
|
|
@@ -70,7 +70,7 @@ import type {
|
|
|
70
70
|
PaginationConfig,
|
|
71
71
|
} from '../routeConfig.target${ext}'
|
|
72
72
|
import { parseQueryParams } from '../parseQueryParams${ext}'
|
|
73
|
-
import { sanitizeKeys, normalizePrefix, getEnv } from '../misc${ext}'
|
|
73
|
+
import { sanitizeKeys, normalizePrefix, getEnv, isPlainObject } from '../misc${ext}'
|
|
74
74
|
import { buildModelOpenApi } from '../buildModelOpenApi${ext}'
|
|
75
75
|
import { validateCountSourceWhere } from '../routeConfig${ext}'
|
|
76
76
|
import type { OperationContext } from '../operationRuntime${ext}'
|
|
@@ -86,6 +86,10 @@ import {
|
|
|
86
86
|
} from '../sse${ext}'
|
|
87
87
|
import { relationModels } from '../relationModels${ext}'
|
|
88
88
|
import { runAutoIncludeProgressive } from '../autoIncludeRuntime${ext}'
|
|
89
|
+
import {
|
|
90
|
+
resolveDroppedGuardProjection,
|
|
91
|
+
applyProjectionToTarget,
|
|
92
|
+
} from '../projectionDefaults${ext}'
|
|
89
93
|
import { MODEL_FIELDS, MODEL_ENUMS } from './${modelName}Metadata${ext}'
|
|
90
94
|
|
|
91
95
|
${(0, generateRouteConfigType_1.generateRouteConfigType)(modelName, 'RequestHandler', guardShapesImport, importStyle, 'express')}
|
|
@@ -214,6 +218,11 @@ export function ${routerFunctionName}<TCtx = unknown, TPrisma = any>(config: ${m
|
|
|
214
218
|
}
|
|
215
219
|
}
|
|
216
220
|
|
|
221
|
+
const buildResolveContext = (req: Request): (() => unknown | Promise<unknown>) | undefined => {
|
|
222
|
+
if (typeof config.resolveContext !== 'function') return undefined
|
|
223
|
+
return () => (config.resolveContext as (r: Request) => unknown | Promise<unknown>)(req)
|
|
224
|
+
}
|
|
225
|
+
|
|
217
226
|
const parseQuery: RequestHandler = (req, res, next) => {
|
|
218
227
|
const rawQuery = req.query
|
|
219
228
|
if (rawQuery && Object.keys(rawQuery).length > 0) {
|
|
@@ -231,19 +240,47 @@ export function ${routerFunctionName}<TCtx = unknown, TPrisma = any>(config: ${m
|
|
|
231
240
|
next()
|
|
232
241
|
}
|
|
233
242
|
|
|
234
|
-
const setShape = (opConfig: OperationConfigLike): RequestHandler => {
|
|
235
|
-
return (req, res, next) => {
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
|
|
243
|
+
const setShape = (opConfig: OperationConfigLike, kind: 'read' | 'write'): RequestHandler => {
|
|
244
|
+
return async (req, res, next) => {
|
|
245
|
+
try {
|
|
246
|
+
const locals = readLocals(res)
|
|
247
|
+
const merged = mergePaginationConfig(config.pagination, opConfig.pagination)
|
|
248
|
+
if (merged) {
|
|
249
|
+
locals.routeConfig = { pagination: merged }
|
|
250
|
+
}
|
|
251
|
+
const headerName = config.guard?.variantHeader || 'x-api-variant'
|
|
252
|
+
const headerValue = req.get(headerName)
|
|
253
|
+
const caller = config.guard?.resolveVariant?.(req) ?? headerValue ?? undefined
|
|
254
|
+
if (caller) locals.guardCaller = caller
|
|
255
|
+
if (opConfig.shape) {
|
|
256
|
+
if (!DROP_GUARD) {
|
|
257
|
+
locals.guardShape = opConfig.shape
|
|
258
|
+
} else {
|
|
259
|
+
const projection = await resolveDroppedGuardProjection(
|
|
260
|
+
opConfig.shape,
|
|
261
|
+
caller,
|
|
262
|
+
buildResolveContext(req),
|
|
263
|
+
)
|
|
264
|
+
if (projection) {
|
|
265
|
+
if (kind === 'read') {
|
|
266
|
+
if (!locals.parsedQuery) locals.parsedQuery = {}
|
|
267
|
+
applyProjectionToTarget(locals.parsedQuery, projection)
|
|
268
|
+
} else {
|
|
269
|
+
if (!isPlainObject(req.body)) {
|
|
270
|
+
req.body = {}
|
|
271
|
+
}
|
|
272
|
+
applyProjectionToTarget(
|
|
273
|
+
req.body as Record<string, unknown>,
|
|
274
|
+
projection,
|
|
275
|
+
)
|
|
276
|
+
}
|
|
277
|
+
}
|
|
278
|
+
}
|
|
279
|
+
}
|
|
280
|
+
next()
|
|
281
|
+
} catch (err) {
|
|
282
|
+
next(mapError(err))
|
|
240
283
|
}
|
|
241
|
-
const headerName = config.guard?.variantHeader || 'x-api-variant'
|
|
242
|
-
const headerValue = req.get(headerName)
|
|
243
|
-
const caller = config.guard?.resolveVariant?.(req) ?? headerValue ?? undefined
|
|
244
|
-
if (caller) locals.guardCaller = caller
|
|
245
|
-
if (opConfig.shape && !DROP_GUARD) locals.guardShape = opConfig.shape
|
|
246
|
-
next()
|
|
247
284
|
}
|
|
248
285
|
}
|
|
249
286
|
|
|
@@ -398,7 +435,7 @@ ${writeOpBlocks}
|
|
|
398
435
|
const path = basePath ? \`\${basePath}/each\` : '/each'
|
|
399
436
|
router.post(
|
|
400
437
|
path,
|
|
401
|
-
setShape(opConfig),
|
|
438
|
+
setShape(opConfig, 'write'),
|
|
402
439
|
...before,
|
|
403
440
|
async (req: Request, res: Response, next: NextFunction) => {
|
|
404
441
|
try {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generateRouter.js","sourceRoot":"","sources":["../../src/generators/generateRouter.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"generateRouter.js","sourceRoot":"","sources":["../../src/generators/generateRouter.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,22 +9,56 @@ function pathExpr(suffix) {
|
|
|
9
9
|
return `basePath || '/'`;
|
|
10
10
|
return `\`\${basePath}${suffix}\``;
|
|
11
11
|
}
|
|
12
|
+
function opKindFor(opName) {
|
|
13
|
+
switch (opName) {
|
|
14
|
+
case 'findUnique':
|
|
15
|
+
case 'findUniqueOrThrow':
|
|
16
|
+
return 'readUnique';
|
|
17
|
+
case 'findMany':
|
|
18
|
+
case 'findFirst':
|
|
19
|
+
case 'findFirstOrThrow':
|
|
20
|
+
case 'findManyPaginated':
|
|
21
|
+
case 'count':
|
|
22
|
+
case 'aggregate':
|
|
23
|
+
case 'groupBy':
|
|
24
|
+
return 'read';
|
|
25
|
+
case 'create':
|
|
26
|
+
return 'create';
|
|
27
|
+
case 'createMany':
|
|
28
|
+
case 'createManyAndReturn':
|
|
29
|
+
return 'createMany';
|
|
30
|
+
case 'update':
|
|
31
|
+
return 'update';
|
|
32
|
+
case 'updateMany':
|
|
33
|
+
case 'updateManyAndReturn':
|
|
34
|
+
return 'updateMany';
|
|
35
|
+
case 'upsert':
|
|
36
|
+
return 'upsert';
|
|
37
|
+
case 'delete':
|
|
38
|
+
return 'delete';
|
|
39
|
+
case 'deleteMany':
|
|
40
|
+
return 'deleteMany';
|
|
41
|
+
default:
|
|
42
|
+
return 'noop';
|
|
43
|
+
}
|
|
44
|
+
}
|
|
12
45
|
function emitReadOp(meta, modelName) {
|
|
13
46
|
const c = meta.name.charAt(0).toUpperCase() + meta.name.slice(1);
|
|
14
47
|
const handlerName = `${modelName}${c}`;
|
|
15
48
|
const pathValue = pathExpr(meta.pathSuffix);
|
|
49
|
+
const opKind = opKindFor(meta.name);
|
|
16
50
|
const postReadLine = meta.supportsPostRead
|
|
17
51
|
? meta.name === 'findMany'
|
|
18
52
|
? ` if (postReadsEnabled) {
|
|
19
53
|
const postPath = basePath ? \`\${basePath}/read\` : '/read'
|
|
20
|
-
instance.post(postPath, handleRead(opConfig, ${handlerName}, parseBodyAsQueryHook))
|
|
54
|
+
instance.post(postPath, handleRead(opConfig, ${handlerName}, parseBodyAsQueryHook, '${opKind}'))
|
|
21
55
|
}`
|
|
22
|
-
: ` if (postReadsEnabled) instance.post(path, handleRead(opConfig, ${handlerName}, parseBodyAsQueryHook))`
|
|
56
|
+
: ` if (postReadsEnabled) instance.post(path, handleRead(opConfig, ${handlerName}, parseBodyAsQueryHook, '${opKind}'))`
|
|
23
57
|
: '';
|
|
24
58
|
return ` if (isEnabled(config.${meta.configKey})) {
|
|
25
59
|
const opConfig: OperationConfigLike = (config.${meta.configKey} as OperationConfigLike | undefined) ?? defaultOpConfig
|
|
26
60
|
const path = ${pathValue}
|
|
27
|
-
instance.get(path, handleRead(opConfig, ${handlerName}, parseQueryHook))
|
|
61
|
+
instance.get(path, handleRead(opConfig, ${handlerName}, parseQueryHook, '${opKind}'))
|
|
28
62
|
${postReadLine}
|
|
29
63
|
}`;
|
|
30
64
|
}
|
|
@@ -32,10 +66,11 @@ function emitWriteOp(meta, modelName) {
|
|
|
32
66
|
const c = meta.name.charAt(0).toUpperCase() + meta.name.slice(1);
|
|
33
67
|
const handlerName = `${modelName}${c}`;
|
|
34
68
|
const pathValue = pathExpr(meta.pathSuffix);
|
|
69
|
+
const opKind = opKindFor(meta.name);
|
|
35
70
|
return ` if (isEnabled(config.${meta.configKey})) {
|
|
36
71
|
const opConfig: OperationConfigLike = (config.${meta.configKey} as OperationConfigLike | undefined) ?? defaultOpConfig
|
|
37
72
|
const path = ${pathValue}
|
|
38
|
-
instance.${meta.method}(path, handleWrite(opConfig, ${handlerName}))
|
|
73
|
+
instance.${meta.method}(path, handleWrite(opConfig, ${handlerName}, '${opKind}'))
|
|
39
74
|
}`;
|
|
40
75
|
}
|
|
41
76
|
function generateFastifyRouterFunction({ model, enums, guardShapesImport, importStyle, writeStrategy, findManyPaginatedMode, dropGuard, }) {
|
|
@@ -63,13 +98,15 @@ import type {
|
|
|
63
98
|
PaginationConfig,
|
|
64
99
|
} from '../routeConfig.target${ext}'
|
|
65
100
|
import { parseQueryParams } from '../parseQueryParams${ext}'
|
|
66
|
-
import { sanitizeKeys, normalizePrefix, getEnv } from '../misc${ext}'
|
|
101
|
+
import { sanitizeKeys, normalizePrefix, getEnv, isPlainObject } from '../misc${ext}'
|
|
67
102
|
import { buildModelOpenApi } from '../buildModelOpenApi${ext}'
|
|
68
103
|
import { validateCountSourceWhere } from '../routeConfig${ext}'
|
|
69
104
|
import type { OperationContext } from '../operationRuntime${ext}'
|
|
70
105
|
import { transformResult } from '../operationRuntime${ext}'
|
|
71
106
|
import { HttpError, mapError } from '../errorMapper${ext}'
|
|
72
107
|
import { mergePaginationConfig } from '../pagination${ext}'
|
|
108
|
+
import { applyDroppedGuard } from '../projectionDefaults${ext}'
|
|
109
|
+
import type { OpKind } from '../projectionDefaults${ext}'
|
|
73
110
|
import { MODEL_FIELDS, MODEL_ENUMS } from './${modelName}Metadata${ext}'
|
|
74
111
|
|
|
75
112
|
${(0, generateRouteConfigType_1.generateRouteConfigType)(modelName, 'FastifyHookHandler', guardShapesImport, importStyle, 'fastify')}
|
|
@@ -130,26 +167,58 @@ function parseBodyAsQueryHook(request: FastifyRequest): void {
|
|
|
130
167
|
(request as FastifyExtended).parsedQuery = sanitizeKeys(body as Record<string, unknown>)
|
|
131
168
|
}
|
|
132
169
|
|
|
170
|
+
function buildResolveContext(
|
|
171
|
+
config: ${modelName}RouteConfig,
|
|
172
|
+
request: FastifyRequest,
|
|
173
|
+
): (() => unknown | Promise<unknown>) | undefined {
|
|
174
|
+
if (typeof config.resolveContext !== 'function') return undefined
|
|
175
|
+
return () => (config.resolveContext as (r: FastifyRequest) => unknown | Promise<unknown>)(request)
|
|
176
|
+
}
|
|
177
|
+
|
|
133
178
|
function makeShapeHook(
|
|
134
179
|
config: ${modelName}RouteConfig,
|
|
135
180
|
opConfig: OperationConfigLike,
|
|
136
|
-
|
|
137
|
-
|
|
181
|
+
opKind: OpKind,
|
|
182
|
+
): (request: FastifyRequest) => Promise<void> {
|
|
183
|
+
return async (request: FastifyRequest) => {
|
|
138
184
|
const fx = request as FastifyExtended
|
|
139
185
|
const merged = mergePaginationConfig(config.pagination, opConfig.pagination)
|
|
140
|
-
if (merged) {
|
|
141
|
-
|
|
142
|
-
}
|
|
186
|
+
if (merged) fx.routeConfig = { pagination: merged }
|
|
187
|
+
|
|
143
188
|
const headerName = (config.guard?.variantHeader || 'x-api-variant').toLowerCase()
|
|
144
189
|
const headerValue = request.headers[headerName]
|
|
145
190
|
const caller = config.guard?.resolveVariant?.(request)
|
|
146
191
|
?? (Array.isArray(headerValue) ? headerValue[0] : headerValue)
|
|
147
192
|
?? undefined
|
|
148
|
-
if (caller)
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
193
|
+
if (caller) fx.guardCaller = caller
|
|
194
|
+
|
|
195
|
+
if (opConfig.shape) {
|
|
196
|
+
if (!DROP_GUARD) {
|
|
197
|
+
fx.guardShape = opConfig.shape
|
|
198
|
+
} else {
|
|
199
|
+
await applyDroppedGuard(
|
|
200
|
+
opConfig.shape,
|
|
201
|
+
caller,
|
|
202
|
+
buildResolveContext(config, request),
|
|
203
|
+
opKind,
|
|
204
|
+
{
|
|
205
|
+
readQuery: fx.parsedQuery,
|
|
206
|
+
writeBody: isPlainObject(request.body)
|
|
207
|
+
? (request.body as Record<string, unknown>)
|
|
208
|
+
: undefined,
|
|
209
|
+
},
|
|
210
|
+
() => {
|
|
211
|
+
if (!fx.parsedQuery) fx.parsedQuery = {}
|
|
212
|
+
return fx.parsedQuery
|
|
213
|
+
},
|
|
214
|
+
() => {
|
|
215
|
+
if (!isPlainObject(request.body)) {
|
|
216
|
+
;(request as unknown as { body: unknown }).body = {}
|
|
217
|
+
}
|
|
218
|
+
return request.body as Record<string, unknown>
|
|
219
|
+
},
|
|
220
|
+
)
|
|
221
|
+
}
|
|
153
222
|
}
|
|
154
223
|
}
|
|
155
224
|
}
|
|
@@ -276,10 +345,11 @@ export async function ${routerFunctionName}<TCtx = unknown, TPrisma = any>(
|
|
|
276
345
|
opConfig: OperationConfigLike,
|
|
277
346
|
handlerFn: (req: FastifyRequest, reply: FastifyReply) => Promise<void>,
|
|
278
347
|
parseFn: (req: FastifyRequest) => void,
|
|
348
|
+
opKind: OpKind,
|
|
279
349
|
) => async (request: FastifyRequest, reply: FastifyReply) => {
|
|
280
350
|
try {
|
|
281
351
|
parseFn(request)
|
|
282
|
-
makeShapeHook(config, opConfig)(request)
|
|
352
|
+
await makeShapeHook(config, opConfig, opKind)(request)
|
|
283
353
|
const { before = [], after = [] } = opConfig
|
|
284
354
|
if (await runHooks(before, request, reply)) return
|
|
285
355
|
await handlerFn(request, reply)
|
|
@@ -293,9 +363,10 @@ export async function ${routerFunctionName}<TCtx = unknown, TPrisma = any>(
|
|
|
293
363
|
const handleWrite = (
|
|
294
364
|
opConfig: OperationConfigLike,
|
|
295
365
|
handlerFn: (req: FastifyRequest, reply: FastifyReply) => Promise<void>,
|
|
366
|
+
opKind: OpKind,
|
|
296
367
|
) => async (request: FastifyRequest, reply: FastifyReply) => {
|
|
297
368
|
try {
|
|
298
|
-
makeShapeHook(config, opConfig)(request)
|
|
369
|
+
await makeShapeHook(config, opConfig, opKind)(request)
|
|
299
370
|
const { before = [], after = [] } = opConfig
|
|
300
371
|
if (await runHooks(before, request, reply)) return
|
|
301
372
|
await handlerFn(request, reply)
|
|
@@ -324,7 +395,7 @@ ${writeOpBlocks}
|
|
|
324
395
|
if (!Array.isArray(request.body)) {
|
|
325
396
|
throw new HttpError(400, 'updateEach body must be an array of { where, data } items')
|
|
326
397
|
}
|
|
327
|
-
makeShapeHook(config, opConfig)(request)
|
|
398
|
+
await makeShapeHook(config, opConfig, 'noop')(request)
|
|
328
399
|
const { before = [], after = [] } = opConfig
|
|
329
400
|
if (await runHooks(before, request, reply)) return
|
|
330
401
|
await ${modelName}UpdateEach(request, reply)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generateRouterFastify.js","sourceRoot":"","sources":["../../src/generators/generateRouterFastify.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"generateRouterFastify.js","sourceRoot":"","sources":["../../src/generators/generateRouterFastify.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,22 +9,56 @@ function pathExpr(suffix) {
|
|
|
9
9
|
return `basePath || '/'`;
|
|
10
10
|
return `\`\${basePath}${suffix}\``;
|
|
11
11
|
}
|
|
12
|
+
function opKindFor(opName) {
|
|
13
|
+
switch (opName) {
|
|
14
|
+
case 'findUnique':
|
|
15
|
+
case 'findUniqueOrThrow':
|
|
16
|
+
return 'readUnique';
|
|
17
|
+
case 'findMany':
|
|
18
|
+
case 'findFirst':
|
|
19
|
+
case 'findFirstOrThrow':
|
|
20
|
+
case 'findManyPaginated':
|
|
21
|
+
case 'count':
|
|
22
|
+
case 'aggregate':
|
|
23
|
+
case 'groupBy':
|
|
24
|
+
return 'read';
|
|
25
|
+
case 'create':
|
|
26
|
+
return 'create';
|
|
27
|
+
case 'createMany':
|
|
28
|
+
case 'createManyAndReturn':
|
|
29
|
+
return 'createMany';
|
|
30
|
+
case 'update':
|
|
31
|
+
return 'update';
|
|
32
|
+
case 'updateMany':
|
|
33
|
+
case 'updateManyAndReturn':
|
|
34
|
+
return 'updateMany';
|
|
35
|
+
case 'upsert':
|
|
36
|
+
return 'upsert';
|
|
37
|
+
case 'delete':
|
|
38
|
+
return 'delete';
|
|
39
|
+
case 'deleteMany':
|
|
40
|
+
return 'deleteMany';
|
|
41
|
+
default:
|
|
42
|
+
return 'noop';
|
|
43
|
+
}
|
|
44
|
+
}
|
|
12
45
|
function emitReadOp(meta, modelName) {
|
|
13
46
|
const c = meta.name.charAt(0).toUpperCase() + meta.name.slice(1);
|
|
14
47
|
const handlerName = `${modelName}${c}`;
|
|
15
48
|
const pathValue = pathExpr(meta.pathSuffix);
|
|
49
|
+
const opKind = opKindFor(meta.name);
|
|
16
50
|
const postReadLine = meta.supportsPostRead
|
|
17
51
|
? meta.name === 'findMany'
|
|
18
52
|
? ` if (postReadsEnabled) {
|
|
19
53
|
const postPath = basePath ? \`\${basePath}/read\` : '/read'
|
|
20
|
-
app.post(postPath, handleRead(opConfig, ${handlerName}, parseBodyAsQueryMiddleware))
|
|
54
|
+
app.post(postPath, handleRead(opConfig, ${handlerName}, parseBodyAsQueryMiddleware, '${opKind}'))
|
|
21
55
|
}`
|
|
22
|
-
: ` if (postReadsEnabled) app.post(path, handleRead(opConfig, ${handlerName}, parseBodyAsQueryMiddleware))`
|
|
56
|
+
: ` if (postReadsEnabled) app.post(path, handleRead(opConfig, ${handlerName}, parseBodyAsQueryMiddleware, '${opKind}'))`
|
|
23
57
|
: '';
|
|
24
58
|
return ` if (isEnabled(config.${meta.configKey})) {
|
|
25
59
|
const opConfig = opFor('${meta.configKey}')
|
|
26
60
|
const path = ${pathValue}
|
|
27
|
-
app.get(path, handleRead(opConfig, ${handlerName}, parseQueryMiddleware))
|
|
61
|
+
app.get(path, handleRead(opConfig, ${handlerName}, parseQueryMiddleware, '${opKind}'))
|
|
28
62
|
${postReadLine}
|
|
29
63
|
}`;
|
|
30
64
|
}
|
|
@@ -32,10 +66,11 @@ function emitWriteOp(meta, modelName) {
|
|
|
32
66
|
const c = meta.name.charAt(0).toUpperCase() + meta.name.slice(1);
|
|
33
67
|
const handlerName = `${modelName}${c}`;
|
|
34
68
|
const pathValue = pathExpr(meta.pathSuffix);
|
|
69
|
+
const opKind = opKindFor(meta.name);
|
|
35
70
|
return ` if (isEnabled(config.${meta.configKey})) {
|
|
36
71
|
const opConfig = opFor('${meta.configKey}')
|
|
37
72
|
const path = ${pathValue}
|
|
38
|
-
app.${meta.method}(path, handleWrite(opConfig, ${handlerName}))
|
|
73
|
+
app.${meta.method}(path, handleWrite(opConfig, ${handlerName}, '${opKind}'))
|
|
39
74
|
}`;
|
|
40
75
|
}
|
|
41
76
|
function generateHonoRouterFunction({ model, enums, guardShapesImport, importStyle, writeStrategy, dropGuard, }) {
|
|
@@ -68,12 +103,14 @@ import type {
|
|
|
68
103
|
PaginationConfig,
|
|
69
104
|
} from '../routeConfig.target${ext}'
|
|
70
105
|
import { parseQueryParams } from '../parseQueryParams${ext}'
|
|
71
|
-
import { normalizePrefix, getEnv, sanitizeKeys } from '../misc${ext}'
|
|
106
|
+
import { normalizePrefix, getEnv, sanitizeKeys, isPlainObject } from '../misc${ext}'
|
|
72
107
|
import { buildModelOpenApi } from '../buildModelOpenApi${ext}'
|
|
73
108
|
import { validateCountSourceWhere } from '../routeConfig${ext}'
|
|
74
109
|
import { transformResult } from '../operationRuntime${ext}'
|
|
75
110
|
import { mapError } from '../errorMapper${ext}'
|
|
76
111
|
import { mergePaginationConfig } from '../pagination${ext}'
|
|
112
|
+
import { applyDroppedGuard } from '../projectionDefaults${ext}'
|
|
113
|
+
import type { OpKind } from '../projectionDefaults${ext}'
|
|
77
114
|
import { MODEL_FIELDS, MODEL_ENUMS } from './${modelName}Metadata${ext}'
|
|
78
115
|
|
|
79
116
|
${(0, generateRouteConfigType_1.generateRouteConfigType)(modelName, 'HonoBeforeHook', guardShapesImport, importStyle, 'hono')}
|
|
@@ -152,18 +189,54 @@ async function parseUpdateEachBodyMiddleware(c: HandlerContext): Promise<void> {
|
|
|
152
189
|
function makeShapeMiddleware<TCtx, TPrisma, TEnv extends HonoEnvBase>(
|
|
153
190
|
config: ${modelName}RouteConfig<TCtx, TPrisma, TEnv>,
|
|
154
191
|
opConfig: OperationConfigLike<TEnv>,
|
|
192
|
+
opKind: OpKind,
|
|
155
193
|
) {
|
|
156
|
-
return (c: Context<GeneratedHonoEnv<TEnv>>): void => {
|
|
194
|
+
return async (c: Context<GeneratedHonoEnv<TEnv>>): Promise<void> => {
|
|
157
195
|
const merged = mergePaginationConfig(config.pagination, opConfig.pagination)
|
|
158
|
-
if (merged) {
|
|
159
|
-
|
|
160
|
-
}
|
|
196
|
+
if (merged) c.set('routeConfig', { pagination: merged })
|
|
197
|
+
|
|
161
198
|
const headerName = config.guard?.variantHeader || 'x-api-variant'
|
|
162
199
|
const headerValue = c.req.header(headerName)
|
|
163
200
|
const caller = config.guard?.resolveVariant?.(c) ?? headerValue ?? undefined
|
|
164
201
|
if (caller) c.set('guardCaller', caller)
|
|
165
|
-
|
|
166
|
-
|
|
202
|
+
|
|
203
|
+
if (opConfig.shape) {
|
|
204
|
+
if (!DROP_GUARD) {
|
|
205
|
+
c.set('guardShape', opConfig.shape)
|
|
206
|
+
} else {
|
|
207
|
+
const resolveCtx = typeof config.resolveContext === 'function'
|
|
208
|
+
? () => (config.resolveContext as (ctx: Context<GeneratedHonoEnv<TEnv>>) => unknown | Promise<unknown>)(c)
|
|
209
|
+
: undefined
|
|
210
|
+
|
|
211
|
+
await applyDroppedGuard(
|
|
212
|
+
opConfig.shape,
|
|
213
|
+
caller,
|
|
214
|
+
resolveCtx,
|
|
215
|
+
opKind,
|
|
216
|
+
{
|
|
217
|
+
readQuery: c.get('parsedQuery'),
|
|
218
|
+
writeBody: isPlainObject(c.get('body'))
|
|
219
|
+
? (c.get('body') as Record<string, unknown>)
|
|
220
|
+
: undefined,
|
|
221
|
+
},
|
|
222
|
+
() => {
|
|
223
|
+
let target = c.get('parsedQuery')
|
|
224
|
+
if (!target) {
|
|
225
|
+
target = {}
|
|
226
|
+
c.set('parsedQuery', target)
|
|
227
|
+
}
|
|
228
|
+
return target
|
|
229
|
+
},
|
|
230
|
+
() => {
|
|
231
|
+
let target = c.get('body')
|
|
232
|
+
if (!isPlainObject(target)) {
|
|
233
|
+
target = {}
|
|
234
|
+
c.set('body', target)
|
|
235
|
+
}
|
|
236
|
+
return target as Record<string, unknown>
|
|
237
|
+
},
|
|
238
|
+
)
|
|
239
|
+
}
|
|
167
240
|
}
|
|
168
241
|
}
|
|
169
242
|
}
|
|
@@ -282,10 +355,11 @@ export function ${routerFunctionName}<TCtx = unknown, TPrisma = any, TEnv extend
|
|
|
282
355
|
opConfig: OperationConfigLike<TEnv>,
|
|
283
356
|
handlerFn: (c: HandlerContext) => Promise<void>,
|
|
284
357
|
parseFn: (c: HandlerContext) => Promise<void>,
|
|
358
|
+
opKind: OpKind,
|
|
285
359
|
) => async (c: Context<GeneratedHonoEnv<TEnv>>): Promise<Response> => {
|
|
286
360
|
try {
|
|
287
361
|
await parseFn(c as unknown as HandlerContext)
|
|
288
|
-
makeShapeMiddleware<TCtx, TPrisma, TEnv>(config, opConfig)(c)
|
|
362
|
+
await makeShapeMiddleware<TCtx, TPrisma, TEnv>(config, opConfig, opKind)(c)
|
|
289
363
|
const { before = [], after = [] } = opConfig
|
|
290
364
|
const beforeResp = await runBeforeHooks<TEnv>(before, c)
|
|
291
365
|
if (beforeResp) return beforeResp
|
|
@@ -301,10 +375,11 @@ export function ${routerFunctionName}<TCtx = unknown, TPrisma = any, TEnv extend
|
|
|
301
375
|
const handleWrite = (
|
|
302
376
|
opConfig: OperationConfigLike<TEnv>,
|
|
303
377
|
handlerFn: (c: HandlerContext) => Promise<void>,
|
|
378
|
+
opKind: OpKind,
|
|
304
379
|
) => async (c: Context<GeneratedHonoEnv<TEnv>>): Promise<Response> => {
|
|
305
380
|
try {
|
|
306
381
|
await parseWriteBodyMiddleware(c as unknown as HandlerContext)
|
|
307
|
-
makeShapeMiddleware<TCtx, TPrisma, TEnv>(config, opConfig)(c)
|
|
382
|
+
await makeShapeMiddleware<TCtx, TPrisma, TEnv>(config, opConfig, opKind)(c)
|
|
308
383
|
const { before = [], after = [] } = opConfig
|
|
309
384
|
const beforeResp = await runBeforeHooks<TEnv>(before, c)
|
|
310
385
|
if (beforeResp) return beforeResp
|
|
@@ -338,7 +413,7 @@ ${writeOpBlocks}
|
|
|
338
413
|
app.post(path, async (c: Context<GeneratedHonoEnv<TEnv>>): Promise<Response> => {
|
|
339
414
|
try {
|
|
340
415
|
await parseUpdateEachBodyMiddleware(c as unknown as HandlerContext)
|
|
341
|
-
makeShapeMiddleware<TCtx, TPrisma, TEnv>(config, opConfig)(c)
|
|
416
|
+
await makeShapeMiddleware<TCtx, TPrisma, TEnv>(config, opConfig, 'noop')(c)
|
|
342
417
|
const { before = [], after = [] } = opConfig
|
|
343
418
|
const beforeResp = await runBeforeHooks<TEnv>(before, c)
|
|
344
419
|
if (beforeResp) return beforeResp
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generateRouterHono.js","sourceRoot":"","sources":["../../src/generators/generateRouterHono.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"generateRouterHono.js","sourceRoot":"","sources":["../../src/generators/generateRouterHono.ts"],"names":[],"mappings":"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"}
|
package/dist/utils/copyFiles.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"copyFiles.js","sourceRoot":"","sources":["../../src/utils/copyFiles.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"copyFiles.js","sourceRoot":"","sources":["../../src/utils/copyFiles.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "prisma-generator-express",
|
|
3
3
|
"description": "Prisma generator for Express, Fastify, and Hono CRUD APIs with OpenAPI documentation",
|
|
4
|
-
"version": "1.62.
|
|
4
|
+
"version": "1.62.3",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
7
7
|
"license": "MIT",
|