nestjs-docfy 0.4.0 → 0.6.0
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/LICENSE +21 -0
- package/README.md +177 -84
- package/dist/apply-docfy-metadata.d.ts +37 -0
- package/dist/apply-docfy-metadata.js +55 -0
- package/dist/apply-docfy-metadata.js.map +1 -0
- package/dist/cli/build-openapi-patch.d.ts +16 -12
- package/dist/cli/build-openapi-patch.js +98 -15
- package/dist/cli/build-openapi-patch.js.map +1 -1
- package/dist/cli/check.js.map +1 -1
- package/dist/cli/coverage.js +1 -3
- package/dist/cli/coverage.js.map +1 -1
- package/dist/cli/detect-project.d.ts +8 -0
- package/dist/cli/detect-project.js +28 -5
- package/dist/cli/detect-project.js.map +1 -1
- package/dist/cli/errors.js.map +1 -1
- package/dist/cli/eval-decorator-args.d.ts +5 -3
- package/dist/cli/eval-decorator-args.js +64 -11
- package/dist/cli/eval-decorator-args.js.map +1 -1
- package/dist/cli/extract-docs-config.d.ts +21 -1
- package/dist/cli/extract-docs-config.js +18 -6
- package/dist/cli/extract-docs-config.js.map +1 -1
- package/dist/cli/extract-methods.d.ts +11 -0
- package/dist/cli/extract-methods.js +113 -29
- package/dist/cli/extract-methods.js.map +1 -1
- package/dist/cli/generate-client.d.ts +15 -0
- package/dist/cli/generate-client.js +62 -0
- package/dist/cli/generate-client.js.map +1 -0
- package/dist/cli/generate-file.js +24 -24
- package/dist/cli/generate-file.js.map +1 -1
- package/dist/cli/index.js +140 -53
- package/dist/cli/index.js.map +1 -1
- package/dist/cli/lint.js +1 -3
- package/dist/cli/lint.js.map +1 -1
- package/dist/cli/logger.js +12 -6
- package/dist/cli/logger.js.map +1 -1
- package/dist/cli/merge-docs.js.map +1 -1
- package/dist/cli/merge-spec-patch.d.ts +15 -8
- package/dist/cli/merge-spec-patch.js +20 -4
- package/dist/cli/merge-spec-patch.js.map +1 -1
- package/dist/cli/parse-args.d.ts +2 -0
- package/dist/cli/parse-args.js +3 -6
- package/dist/cli/parse-args.js.map +1 -1
- package/dist/cli/patch-spec.d.ts +32 -8
- package/dist/cli/patch-spec.js +37 -15
- package/dist/cli/patch-spec.js.map +1 -1
- package/dist/cli/read-spec-source.d.ts +7 -0
- package/dist/cli/read-spec-source.js +74 -0
- package/dist/cli/read-spec-source.js.map +1 -0
- package/dist/cli/register-webpack-plugin.d.ts +16 -0
- package/dist/cli/register-webpack-plugin.js +46 -0
- package/dist/cli/register-webpack-plugin.js.map +1 -0
- package/dist/cli/resolve-tsconfig.js +1 -5
- package/dist/cli/resolve-tsconfig.js.map +1 -1
- package/dist/cli/scan-controllers.d.ts +11 -0
- package/dist/cli/scan-controllers.js +10 -3
- package/dist/cli/scan-controllers.js.map +1 -1
- package/dist/cli/watch.js +3 -1
- package/dist/cli/watch.js.map +1 -1
- package/dist/cli/writer.js.map +1 -1
- package/dist/docfy-ui.module.d.ts +13 -0
- package/dist/docfy-ui.module.js +6 -3
- package/dist/docfy-ui.module.js.map +1 -1
- package/dist/docfy.module.js +1 -1
- package/dist/docfy.module.js.map +1 -1
- package/dist/docs.js.map +1 -1
- package/dist/index.d.ts +2 -1
- package/dist/index.js +3 -1
- package/dist/index.js.map +1 -1
- package/dist/plugin/generate-metadata.d.ts +35 -0
- package/dist/plugin/generate-metadata.js +46 -0
- package/dist/plugin/generate-metadata.js.map +1 -0
- package/dist/plugin/index.d.ts +30 -0
- package/dist/plugin/index.js +62 -0
- package/dist/plugin/index.js.map +1 -0
- package/dist/registry.d.ts +3 -3
- package/dist/registry.js.map +1 -1
- package/dist/resolve-docs-path.d.ts +1 -1
- package/dist/resolve-docs-path.js.map +1 -1
- package/dist/resolve-source-from-stack.js.map +1 -1
- package/dist/with-docs.decorator.js.map +1 -1
- package/package.json +25 -4
- package/dist/require-ts.d.ts +0 -32
- package/dist/require-ts.js +0 -122
- package/dist/require-ts.js.map +0 -1
|
@@ -14,19 +14,31 @@ const eval_decorator_args_1 = require("./eval-decorator-args");
|
|
|
14
14
|
* to the same class object the running app uses (see the README's "Not
|
|
15
15
|
* supported: webpack: true" section for why the runtime pipeline can't).
|
|
16
16
|
*
|
|
17
|
+
* Without `context`, the file is parsed in an isolated in-memory project
|
|
18
|
+
* with nothing else in scope — fine for the `docs(...)` call's own literal
|
|
19
|
+
* structure, but a decorator argument referencing an imported symbol will
|
|
20
|
+
* never resolve (see `DocsFileProjectContext`). Pass `context` to fix that.
|
|
21
|
+
*
|
|
17
22
|
* Returns null if the file can't be parsed or no `docs(...)` call is found.
|
|
18
23
|
*/
|
|
19
|
-
function extractDocsConfig(sourceText) {
|
|
24
|
+
function extractDocsConfig(sourceText, context) {
|
|
20
25
|
let project;
|
|
21
|
-
|
|
22
|
-
project =
|
|
26
|
+
if (context) {
|
|
27
|
+
project = context.project;
|
|
23
28
|
}
|
|
24
|
-
|
|
25
|
-
|
|
29
|
+
else {
|
|
30
|
+
try {
|
|
31
|
+
project = new ts_morph_1.Project({ useInMemoryFileSystem: true, skipFileDependencyResolution: true });
|
|
32
|
+
}
|
|
33
|
+
catch {
|
|
34
|
+
return null;
|
|
35
|
+
}
|
|
26
36
|
}
|
|
27
37
|
let sf;
|
|
28
38
|
try {
|
|
29
|
-
sf =
|
|
39
|
+
sf = context
|
|
40
|
+
? project.createSourceFile(context.absolutePath, sourceText, { overwrite: true })
|
|
41
|
+
: project.createSourceFile('docs.ts', sourceText);
|
|
30
42
|
}
|
|
31
43
|
catch {
|
|
32
44
|
return null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"extract-docs-config.js","sourceRoot":"","sources":["../../src/cli/extract-docs-config.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"extract-docs-config.js","sourceRoot":"","sources":["../../src/cli/extract-docs-config.ts"],"names":[],"mappings":"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"}
|
|
@@ -19,6 +19,7 @@ export interface SchemaProperty {
|
|
|
19
19
|
minLength?: number;
|
|
20
20
|
maxLength?: number;
|
|
21
21
|
enum?: (string | number)[];
|
|
22
|
+
oneOf?: SchemaProperty[];
|
|
22
23
|
}
|
|
23
24
|
export interface InlineSchema {
|
|
24
25
|
properties: Record<string, SchemaProperty>;
|
|
@@ -50,6 +51,16 @@ export interface ResponseTypeInfo {
|
|
|
50
51
|
* Used to emit `schema:` instead of `type:` so docs are accurate even without @ApiProperty.
|
|
51
52
|
*/
|
|
52
53
|
classSchema?: InlineSchema;
|
|
54
|
+
/**
|
|
55
|
+
* Set when the original type was a union of ≥2 named DTO/entity types
|
|
56
|
+
* (e.g. `UserDto | AdminDto`), each resolved the same way a single named
|
|
57
|
+
* type would be. `name` becomes a ` | `-joined, non-identifier placeholder
|
|
58
|
+
* so the existing `IDENTIFIER_RE` guards in generate-file.ts continue to
|
|
59
|
+
* treat this like any other unresolvable type (no import, no `type:`
|
|
60
|
+
* codegen) — only patch-spec's schema synthesis reads `unionMembers`, to
|
|
61
|
+
* build an OpenAPI `oneOf`.
|
|
62
|
+
*/
|
|
63
|
+
unionMembers?: ResponseTypeInfo[];
|
|
53
64
|
}
|
|
54
65
|
export interface MethodInfo {
|
|
55
66
|
name: string;
|
|
@@ -4,19 +4,45 @@ exports.extractMethods = extractMethods;
|
|
|
4
4
|
exports.extractControllerAuth = extractControllerAuth;
|
|
5
5
|
exports.extractControllerPath = extractControllerPath;
|
|
6
6
|
const ts_morph_1 = require("ts-morph");
|
|
7
|
-
const HTTP_DECORATORS = new Set([
|
|
8
|
-
'Get', 'Post', 'Put', 'Patch', 'Delete', 'Head', 'Options', 'All',
|
|
9
|
-
]);
|
|
7
|
+
const HTTP_DECORATORS = new Set(['Get', 'Post', 'Put', 'Patch', 'Delete', 'Head', 'Options', 'All']);
|
|
10
8
|
const NEST_PARAM_DECORATORS = new Set([
|
|
11
|
-
'Param',
|
|
12
|
-
'
|
|
9
|
+
'Param',
|
|
10
|
+
'Body',
|
|
11
|
+
'Query',
|
|
12
|
+
'Headers',
|
|
13
|
+
'Req',
|
|
14
|
+
'Res',
|
|
15
|
+
'Request',
|
|
16
|
+
'Response',
|
|
17
|
+
'Session',
|
|
18
|
+
'UploadedFile',
|
|
19
|
+
'UploadedFiles',
|
|
20
|
+
'Ip',
|
|
21
|
+
'HostParam',
|
|
13
22
|
]);
|
|
14
23
|
/** Primitives and built-ins that should never appear as ApiResponse/ApiBody type. */
|
|
15
24
|
const SKIP_TYPE_NAMES = new Set([
|
|
16
|
-
'void',
|
|
17
|
-
'
|
|
18
|
-
'
|
|
19
|
-
'
|
|
25
|
+
'void',
|
|
26
|
+
'undefined',
|
|
27
|
+
'null',
|
|
28
|
+
'never',
|
|
29
|
+
'unknown',
|
|
30
|
+
'any',
|
|
31
|
+
'string',
|
|
32
|
+
'number',
|
|
33
|
+
'boolean',
|
|
34
|
+
'object',
|
|
35
|
+
'symbol',
|
|
36
|
+
'bigint',
|
|
37
|
+
'String',
|
|
38
|
+
'Number',
|
|
39
|
+
'Boolean',
|
|
40
|
+
'Object',
|
|
41
|
+
'Array',
|
|
42
|
+
'Promise',
|
|
43
|
+
'Observable',
|
|
44
|
+
'Subject',
|
|
45
|
+
'BehaviorSubject',
|
|
20
46
|
]);
|
|
21
47
|
const IDENTIFIER_RE = /^[$_a-zA-Z][$_a-zA-Z0-9]*$/;
|
|
22
48
|
function getDecoratorName(dec) {
|
|
@@ -103,9 +129,25 @@ function typeToSchemaProperty(type, depth) {
|
|
|
103
129
|
else if (nonNull.length === 0) {
|
|
104
130
|
return { nullable: true };
|
|
105
131
|
}
|
|
132
|
+
else if (nonNull.every((t) => t.isStringLiteral())) {
|
|
133
|
+
// Union of string literals — the common "poor man's enum" shape (`'a' | 'b' | 'c'`).
|
|
134
|
+
const values = nonNull.map((t) => t.getLiteralValue()).filter((v) => typeof v === 'string');
|
|
135
|
+
return { type: 'string', enum: values, ...(isNullable ? { nullable: true } : {}) };
|
|
136
|
+
}
|
|
137
|
+
else if (nonNull.every((t) => t.isNumberLiteral())) {
|
|
138
|
+
const values = nonNull.map((t) => t.getLiteralValue()).filter((v) => typeof v === 'number');
|
|
139
|
+
const allIntegers = values.every((v) => Number.isInteger(v));
|
|
140
|
+
return {
|
|
141
|
+
type: allIntegers ? 'integer' : 'number',
|
|
142
|
+
enum: values,
|
|
143
|
+
...(isNullable ? { nullable: true } : {}),
|
|
144
|
+
};
|
|
145
|
+
}
|
|
106
146
|
else {
|
|
107
|
-
//
|
|
108
|
-
|
|
147
|
+
// Heterogeneous union (mixed primitive kinds, or ≥2 object/interface types) —
|
|
148
|
+
// represent as oneOf rather than silently dropping the type info.
|
|
149
|
+
const oneOf = nonNull.map((t) => typeToSchemaProperty(t, depth + 1));
|
|
150
|
+
return { oneOf, ...(isNullable ? { nullable: true } : {}) };
|
|
109
151
|
}
|
|
110
152
|
}
|
|
111
153
|
const prop = {};
|
|
@@ -229,11 +271,15 @@ function classHasApiProperty(cls) {
|
|
|
229
271
|
if (dec.getName() === 'ApiProperty')
|
|
230
272
|
return true;
|
|
231
273
|
}
|
|
232
|
-
catch {
|
|
274
|
+
catch {
|
|
275
|
+
/* ignore */
|
|
276
|
+
}
|
|
233
277
|
}
|
|
234
278
|
}
|
|
235
279
|
}
|
|
236
|
-
catch {
|
|
280
|
+
catch {
|
|
281
|
+
/* ignore */
|
|
282
|
+
}
|
|
237
283
|
return false;
|
|
238
284
|
}
|
|
239
285
|
/** Safely reads the first numeric literal argument of a decorator. */
|
|
@@ -268,12 +314,14 @@ function buildSchemaFromClass(cls) {
|
|
|
268
314
|
if (!IDENTIFIER_RE.test(propName))
|
|
269
315
|
continue;
|
|
270
316
|
const decorators = prop.getDecorators();
|
|
271
|
-
const decoratorNames = new Set(decorators.map((d) => {
|
|
272
|
-
|
|
273
|
-
|
|
274
|
-
|
|
275
|
-
|
|
276
|
-
|
|
317
|
+
const decoratorNames = new Set(decorators.map((d) => {
|
|
318
|
+
try {
|
|
319
|
+
return d.getName();
|
|
320
|
+
}
|
|
321
|
+
catch {
|
|
322
|
+
return '';
|
|
323
|
+
}
|
|
324
|
+
}));
|
|
277
325
|
// Collect type info from whitelisted decorators
|
|
278
326
|
const schema = {};
|
|
279
327
|
let hasCV = false;
|
|
@@ -319,7 +367,9 @@ function buildSchemaFromClass(cls) {
|
|
|
319
367
|
if (!isOptional)
|
|
320
368
|
required.push(propName);
|
|
321
369
|
}
|
|
322
|
-
catch {
|
|
370
|
+
catch {
|
|
371
|
+
/* skip unresolvable property */
|
|
372
|
+
}
|
|
323
373
|
}
|
|
324
374
|
if (!foundAny)
|
|
325
375
|
return null;
|
|
@@ -330,19 +380,57 @@ function buildSchemaFromClass(cls) {
|
|
|
330
380
|
}
|
|
331
381
|
}
|
|
332
382
|
// ---------------------------------------------------------------------------
|
|
383
|
+
/**
|
|
384
|
+
* Resolves a union type (`A | B`) into a `ResponseTypeInfo` carrying
|
|
385
|
+
* `unionMembers` — used by patch-spec to synthesize an OpenAPI `oneOf`
|
|
386
|
+
* schema, the common shape for a return type or `@Body()` payload that's a
|
|
387
|
+
* discriminated union of DTOs/entities. Bails to null (matching the existing
|
|
388
|
+
* "leave alone" behavior for unresolvable types) unless every non-null/
|
|
389
|
+
* undefined branch resolves to a named type — a partial `oneOf` that
|
|
390
|
+
* silently drops a branch would be worse than no schema at all.
|
|
391
|
+
*
|
|
392
|
+
* `name` is deliberately a ` | `-joined, non-identifier string: every
|
|
393
|
+
* `IDENTIFIER_RE` guard in generate-file.ts already treats a non-identifier
|
|
394
|
+
* `name` as "nothing safe to import/reference", so a union responseType
|
|
395
|
+
* flows through `generate` exactly like today's unresolvable-type case,
|
|
396
|
+
* with zero changes needed there.
|
|
397
|
+
*/
|
|
398
|
+
function resolveUnionOfNamedTypes(type, isArray) {
|
|
399
|
+
const branches = type.getUnionTypes().filter((t) => !t.isNull() && !t.isUndefined());
|
|
400
|
+
if (branches.length < 2) {
|
|
401
|
+
return branches.length === 1 ? resolveNamedType(branches[0], isArray) : null;
|
|
402
|
+
}
|
|
403
|
+
const members = [];
|
|
404
|
+
for (const branch of branches) {
|
|
405
|
+
const resolved = resolveNamedType(branch, false);
|
|
406
|
+
if (!resolved)
|
|
407
|
+
return null;
|
|
408
|
+
members.push(resolved);
|
|
409
|
+
}
|
|
410
|
+
return {
|
|
411
|
+
name: members.map((m) => m.name).join(' | '),
|
|
412
|
+
absolutePath: members[0].absolutePath,
|
|
413
|
+
isArray,
|
|
414
|
+
isInterface: false,
|
|
415
|
+
unionMembers: members,
|
|
416
|
+
};
|
|
417
|
+
}
|
|
333
418
|
/**
|
|
334
419
|
* Resolves a named DTO/class type from a ts-morph Type.
|
|
335
|
-
* Returns null for primitives, anonymous objects,
|
|
420
|
+
* Returns null for primitives, anonymous objects, intersections, node_modules, .d.ts.
|
|
421
|
+
* Unions are delegated to `resolveUnionOfNamedTypes` instead of bailing.
|
|
336
422
|
*/
|
|
337
423
|
function resolveNamedType(type, isArray) {
|
|
338
424
|
try {
|
|
425
|
+
if (type.isUnion())
|
|
426
|
+
return resolveUnionOfNamedTypes(type, isArray);
|
|
339
427
|
if (type.isString() || type.isNumber() || type.isBoolean())
|
|
340
428
|
return null;
|
|
341
429
|
if (type.isUndefined() || type.isNull() || type.isVoid())
|
|
342
430
|
return null;
|
|
343
431
|
if (type.isAnonymous())
|
|
344
432
|
return null;
|
|
345
|
-
if (type.
|
|
433
|
+
if (type.isIntersection())
|
|
346
434
|
return null;
|
|
347
435
|
if (type.isTuple())
|
|
348
436
|
return null;
|
|
@@ -364,11 +452,9 @@ function resolveNamedType(type, isArray) {
|
|
|
364
452
|
if (absolutePath.endsWith('.d.ts'))
|
|
365
453
|
return null;
|
|
366
454
|
const isInterface = declarations[0].getKind() === ts_morph_1.SyntaxKind.InterfaceDeclaration;
|
|
367
|
-
const inlineSchema = isInterface
|
|
368
|
-
? buildSchemaFromInterface(declarations[0], 0)
|
|
369
|
-
: undefined;
|
|
455
|
+
const inlineSchema = isInterface ? buildSchemaFromInterface(declarations[0], 0) : undefined;
|
|
370
456
|
const classSchema = !isInterface && declarations[0].getKind() === ts_morph_1.SyntaxKind.ClassDeclaration
|
|
371
|
-
? buildSchemaFromClass(declarations[0]) ?? undefined
|
|
457
|
+
? (buildSchemaFromClass(declarations[0]) ?? undefined)
|
|
372
458
|
: undefined;
|
|
373
459
|
return { name, absolutePath, isArray, isInterface, inlineSchema, classSchema };
|
|
374
460
|
}
|
|
@@ -514,9 +600,7 @@ function extractMethods(cls, controllerAuth) {
|
|
|
514
600
|
let returnType = 'unknown';
|
|
515
601
|
try {
|
|
516
602
|
const returnTypeNode = method.getReturnTypeNode();
|
|
517
|
-
returnType = returnTypeNode
|
|
518
|
-
? returnTypeNode.getText()
|
|
519
|
-
: cleanTypeText(method.getReturnType().getText());
|
|
603
|
+
returnType = returnTypeNode ? returnTypeNode.getText() : cleanTypeText(method.getReturnType().getText());
|
|
520
604
|
}
|
|
521
605
|
catch {
|
|
522
606
|
// ts-morph can fail to infer complex types — keep 'unknown'
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"extract-methods.js","sourceRoot":"","sources":["../../src/cli/extract-methods.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"extract-methods.js","sourceRoot":"","sources":["../../src/cli/extract-methods.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
import type { OpenApiDocument } from './merge-spec-patch';
|
|
2
|
+
export interface ClientFiles {
|
|
3
|
+
/** Contents of schema.d.ts — the generated types, via openapi-typescript. */
|
|
4
|
+
schema: string;
|
|
5
|
+
/** Contents of client.ts — a thin typed wrapper over openapi-fetch. */
|
|
6
|
+
client: string;
|
|
7
|
+
}
|
|
8
|
+
/**
|
|
9
|
+
* Generates a typed TypeScript client from an OpenAPI document — a thin
|
|
10
|
+
* wrapper over openapi-typescript (types) + openapi-fetch (the runtime
|
|
11
|
+
* client), rather than a from-scratch code generator. openapi-fetch itself
|
|
12
|
+
* is deliberately NOT a dependency of nestjs-docfy: it's only imported by
|
|
13
|
+
* the generated client.ts, so it belongs in the consuming project.
|
|
14
|
+
*/
|
|
15
|
+
export declare function buildClientFiles(document: OpenApiDocument): Promise<ClientFiles>;
|
|
@@ -0,0 +1,62 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || (function () {
|
|
19
|
+
var ownKeys = function(o) {
|
|
20
|
+
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
21
|
+
var ar = [];
|
|
22
|
+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
23
|
+
return ar;
|
|
24
|
+
};
|
|
25
|
+
return ownKeys(o);
|
|
26
|
+
};
|
|
27
|
+
return function (mod) {
|
|
28
|
+
if (mod && mod.__esModule) return mod;
|
|
29
|
+
var result = {};
|
|
30
|
+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
31
|
+
__setModuleDefault(result, mod);
|
|
32
|
+
return result;
|
|
33
|
+
};
|
|
34
|
+
})();
|
|
35
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
36
|
+
exports.buildClientFiles = buildClientFiles;
|
|
37
|
+
const openapi_typescript_1 = __importStar(require("openapi-typescript"));
|
|
38
|
+
function buildClientWrapper(schemaFileName) {
|
|
39
|
+
return `// Generated by nestjs-docfy generate-client — re-run to update, edit freely otherwise.
|
|
40
|
+
// Requires the peer dependency 'openapi-fetch': npm install openapi-fetch
|
|
41
|
+
import createClient from 'openapi-fetch';
|
|
42
|
+
import type { paths } from './${schemaFileName}';
|
|
43
|
+
|
|
44
|
+
export function createApiClient(baseUrl: string) {
|
|
45
|
+
return createClient<paths>({ baseUrl });
|
|
46
|
+
}
|
|
47
|
+
`;
|
|
48
|
+
}
|
|
49
|
+
/**
|
|
50
|
+
* Generates a typed TypeScript client from an OpenAPI document — a thin
|
|
51
|
+
* wrapper over openapi-typescript (types) + openapi-fetch (the runtime
|
|
52
|
+
* client), rather than a from-scratch code generator. openapi-fetch itself
|
|
53
|
+
* is deliberately NOT a dependency of nestjs-docfy: it's only imported by
|
|
54
|
+
* the generated client.ts, so it belongs in the consuming project.
|
|
55
|
+
*/
|
|
56
|
+
async function buildClientFiles(document) {
|
|
57
|
+
const ast = await (0, openapi_typescript_1.default)(document);
|
|
58
|
+
const schema = (0, openapi_typescript_1.astToString)(ast);
|
|
59
|
+
const client = buildClientWrapper('schema');
|
|
60
|
+
return { schema, client };
|
|
61
|
+
}
|
|
62
|
+
//# sourceMappingURL=generate-client.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"generate-client.js","sourceRoot":"","sources":["../../src/cli/generate-client.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA6BA,4CAKC;AAlCD,yEAA4D;AAU5D,SAAS,kBAAkB,CAAC,cAAsB;IAChD,OAAO;;;gCAGuB,cAAc;;;;;CAK7C,CAAC;AACF,CAAC;AAED;;;;;;GAMG;AACI,KAAK,UAAU,gBAAgB,CAAC,QAAyB;IAC9D,MAAM,GAAG,GAAG,MAAM,IAAA,4BAAS,EAAC,QAAe,CAAC,CAAC;IAC7C,MAAM,MAAM,GAAG,IAAA,gCAAW,EAAC,GAAG,CAAC,CAAC;IAChC,MAAM,MAAM,GAAG,kBAAkB,CAAC,QAAQ,CAAC,CAAC;IAC5C,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;AAC5B,CAAC"}
|
|
@@ -32,9 +32,12 @@ function defaultStatusCode(httpDecorator, httpStatusCode) {
|
|
|
32
32
|
if (httpStatusCode !== null)
|
|
33
33
|
return httpStatusCode;
|
|
34
34
|
switch (httpDecorator) {
|
|
35
|
-
case 'Post':
|
|
36
|
-
|
|
37
|
-
|
|
35
|
+
case 'Post':
|
|
36
|
+
return 201;
|
|
37
|
+
case 'Delete':
|
|
38
|
+
return 204;
|
|
39
|
+
default:
|
|
40
|
+
return 200;
|
|
38
41
|
}
|
|
39
42
|
}
|
|
40
43
|
// ---------------------------------------------------------------------------
|
|
@@ -114,15 +117,11 @@ function methodSignatureComment(m) {
|
|
|
114
117
|
const verb = m.httpDecorator ? `${m.httpDecorator.toUpperCase()} ` : '';
|
|
115
118
|
const httpPath = m.httpPath !== null ? sanitizeHttpPath(m.httpPath) : '';
|
|
116
119
|
const route = verb || httpPath ? `${verb}${httpPath} → ` : '';
|
|
117
|
-
const paramList = m.params
|
|
118
|
-
.map((p) => `${sanitizeIdentifier(p.name, '_')}: ${sanitizeComment(p.type)}`)
|
|
119
|
-
.join(', ');
|
|
120
|
+
const paramList = m.params.map((p) => `${sanitizeIdentifier(p.name, '_')}: ${sanitizeComment(p.type)}`).join(', ');
|
|
120
121
|
const returnType = sanitizeComment(m.returnType);
|
|
121
122
|
const asyncPrefix = m.isAsync ? 'async ' : '';
|
|
122
123
|
const methodName = sanitizeIdentifier(m.name, '_');
|
|
123
|
-
const inherited = m.isInherited && m.inheritedFrom
|
|
124
|
-
? ` [inherited from ${sanitizeComment(m.inheritedFrom)}]`
|
|
125
|
-
: '';
|
|
124
|
+
const inherited = m.isInherited && m.inheritedFrom ? ` [inherited from ${sanitizeComment(m.inheritedFrom)}]` : '';
|
|
126
125
|
return `${route}${asyncPrefix}${methodName}(${paramList}): ${returnType}${inherited}`;
|
|
127
126
|
}
|
|
128
127
|
// ---------------------------------------------------------------------------
|
|
@@ -191,9 +190,13 @@ function renderSchemaProperty(prop, indent) {
|
|
|
191
190
|
if (prop.maxLength !== undefined)
|
|
192
191
|
pairs.push(`${inner}maxLength: ${prop.maxLength}`);
|
|
193
192
|
if (prop.enum && prop.enum.length > 0) {
|
|
194
|
-
const vals = prop.enum.map((v) => typeof v === 'string' ? `'${v}'` : String(v)).join(', ');
|
|
193
|
+
const vals = prop.enum.map((v) => (typeof v === 'string' ? `'${v}'` : String(v))).join(', ');
|
|
195
194
|
pairs.push(`${inner}enum: [${vals}]`);
|
|
196
195
|
}
|
|
196
|
+
if (prop.oneOf && prop.oneOf.length > 0) {
|
|
197
|
+
const entries = prop.oneOf.map((p) => `${inner} ${renderSchemaProperty(p, `${inner} `)}`).join(',\n');
|
|
198
|
+
pairs.push(`${inner}oneOf: [\n${entries},\n${inner}]`);
|
|
199
|
+
}
|
|
197
200
|
if (prop.items !== undefined) {
|
|
198
201
|
pairs.push(`${inner}items: ${renderSchemaProperty(prop.items, inner)}`);
|
|
199
202
|
}
|
|
@@ -266,9 +269,7 @@ function renderApiResponse(status, responseType, baseIndent) {
|
|
|
266
269
|
`${baseIndent}})`,
|
|
267
270
|
].join('\n');
|
|
268
271
|
}
|
|
269
|
-
const typePart = responseType.isArray
|
|
270
|
-
? `[${responseType.name}]`
|
|
271
|
-
: responseType.name;
|
|
272
|
+
const typePart = responseType.isArray ? `[${responseType.name}]` : responseType.name;
|
|
272
273
|
return `ApiResponse({ status: ${status}, description: '${description}', type: ${typePart} })`;
|
|
273
274
|
}
|
|
274
275
|
// ---------------------------------------------------------------------------
|
|
@@ -307,9 +308,7 @@ function renderMethod(m, indent) {
|
|
|
307
308
|
if (m.requiresAuth)
|
|
308
309
|
lines.push(`${inner}ApiBearerAuth(),`);
|
|
309
310
|
for (const p of m.params) {
|
|
310
|
-
const paramLine = renderApiParam(p, inner)
|
|
311
|
-
?? renderApiQuery(p, inner)
|
|
312
|
-
?? renderApiBody(p, inner);
|
|
311
|
+
const paramLine = renderApiParam(p, inner) ?? renderApiQuery(p, inner) ?? renderApiBody(p, inner);
|
|
313
312
|
if (paramLine)
|
|
314
313
|
lines.push(paramLine);
|
|
315
314
|
}
|
|
@@ -342,7 +341,9 @@ function renderDocsFile(ctrl, docsFilePath, format) {
|
|
|
342
341
|
const dtoImports = collectDtoImports(ctrl.methods, docsFilePath);
|
|
343
342
|
const swaggerDecorators = collectSwaggerDecorators(ctrl);
|
|
344
343
|
const swaggerImportList = [
|
|
345
|
-
'ApiTags',
|
|
344
|
+
'ApiTags',
|
|
345
|
+
'ApiOperation',
|
|
346
|
+
'ApiResponse',
|
|
346
347
|
...(swaggerDecorators.has('ApiBearerAuth') ? ['ApiBearerAuth'] : []),
|
|
347
348
|
...(swaggerDecorators.has('ApiParam') ? ['ApiParam'] : []),
|
|
348
349
|
...(swaggerDecorators.has('ApiQuery') ? ['ApiQuery'] : []),
|
|
@@ -356,9 +357,7 @@ function renderDocsFile(ctrl, docsFilePath, format) {
|
|
|
356
357
|
? ' // No public HTTP methods found.'
|
|
357
358
|
: ctrl.methods.map((m) => renderMethod(m, ' ')).join('\n\n');
|
|
358
359
|
if (format === 'js') {
|
|
359
|
-
const requireLines = dtoImports
|
|
360
|
-
.map((i) => `const { ${i.name} } = require('${i.importPath}');`)
|
|
361
|
-
.join('\n');
|
|
360
|
+
const requireLines = dtoImports.map((i) => `const { ${i.name} } = require('${i.importPath}');`).join('\n');
|
|
362
361
|
return [
|
|
363
362
|
`// Generated by nestjs-docfy — edit freely, use --force to merge new methods`,
|
|
364
363
|
``,
|
|
@@ -372,15 +371,16 @@ function renderDocsFile(ctrl, docsFilePath, format) {
|
|
|
372
371
|
classDecoratorLines,
|
|
373
372
|
` ],`,
|
|
374
373
|
` methods: {`,
|
|
375
|
-
methodsBlock
|
|
374
|
+
methodsBlock
|
|
375
|
+
.split('\n')
|
|
376
|
+
.map((l) => (l ? ` ${l}` : l))
|
|
377
|
+
.join('\n'),
|
|
376
378
|
` },`,
|
|
377
379
|
`});`,
|
|
378
380
|
``,
|
|
379
381
|
].join('\n');
|
|
380
382
|
}
|
|
381
|
-
const importLines = dtoImports
|
|
382
|
-
.map((i) => `import { ${i.name} } from '${i.importPath}';`)
|
|
383
|
-
.join('\n');
|
|
383
|
+
const importLines = dtoImports.map((i) => `import { ${i.name} } from '${i.importPath}';`).join('\n');
|
|
384
384
|
return [
|
|
385
385
|
`// Generated by nestjs-docfy — edit freely, use --force to merge new methods`,
|
|
386
386
|
`import { docs } from 'nestjs-docfy';`,
|