@buildvision/nest-sdk-generator 2.3.0 → 3.0.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/.eslintrc.js +1 -1
- package/.github/workflows/test.yml +35 -0
- package/README.md +402 -239
- package/build/analyzer/classdeps.js +36 -4
- package/build/analyzer/controller.d.ts +2 -14
- package/build/analyzer/controller.js +38 -18
- package/build/analyzer/controllers.d.ts +2 -2
- package/build/analyzer/controllers.js +37 -5
- package/build/analyzer/extractor.d.ts +2 -41
- package/build/analyzer/extractor.js +63 -66
- package/build/analyzer/index.d.ts +2 -6
- package/build/analyzer/index.js +107 -86
- package/build/analyzer/methods.d.ts +2 -30
- package/build/analyzer/methods.js +7 -16
- package/build/analyzer/module.js +36 -4
- package/build/analyzer/params.d.ts +3 -39
- package/build/analyzer/params.js +17 -37
- package/build/analyzer/route.js +8 -9
- package/build/analyzer/sdk.d.ts +146 -0
- package/build/analyzer/sdk.js +120 -0
- package/build/analyzer/typedeps.d.ts +15 -0
- package/build/analyzer/typedeps.js +62 -10
- package/build/bin.js +72 -25
- package/build/config.d.ts +13 -0
- package/build/config.js +36 -3
- package/build/engine/analyze.d.ts +16 -0
- package/build/engine/analyze.js +786 -0
- package/build/engine/ast.d.ts +24 -0
- package/build/engine/ast.js +100 -0
- package/build/engine/file-order.d.ts +17 -0
- package/build/engine/file-order.js +97 -0
- package/build/engine/host.d.ts +63 -0
- package/build/engine/host.js +16 -0
- package/build/engine/index.d.ts +15 -0
- package/build/engine/index.js +93 -0
- package/build/engine/ts-morph-compat-host.d.ts +8 -0
- package/build/engine/ts-morph-compat-host.js +18 -0
- package/build/engine/tsgo-host.d.ts +9 -0
- package/build/engine/tsgo-host.js +136 -0
- package/build/engine/typescript-host.d.ts +26 -0
- package/build/engine/typescript-host.js +142 -0
- package/build/generator/genmodules.d.ts +1 -4
- package/build/generator/genmodules.js +23 -27
- package/build/generator/gentypes.d.ts +1 -1
- package/build/generator/gentypes.js +36 -4
- package/build/generator/index.d.ts +1 -1
- package/build/generator/index.js +91 -69
- package/build/generator/prettier.js +43 -9
- package/build/generator/sdk-interface.d.ts +1 -1
- package/build/generator/sdk-interface.js +5 -5
- package/build/logging.d.ts +3 -0
- package/build/logging.js +17 -10
- package/build/rtk-query-generator/genmodules.d.ts +1 -4
- package/build/rtk-query-generator/genmodules.js +31 -33
- package/build/rtk-query-generator/index.d.ts +1 -1
- package/build/rtk-query-generator/index.js +87 -72
- package/build/rtk-query-generator/prettier.js +43 -9
- package/build/rtk-query-generator/sdk-interface.js +3 -4
- package/build/utils.js +38 -6
- package/package.json +29 -11
- package/src/analyzer/controller.ts +3 -31
- package/src/analyzer/controllers.ts +3 -2
- package/src/analyzer/extractor.ts +17 -86
- package/src/analyzer/index.ts +5 -11
- package/src/analyzer/methods.ts +5 -36
- package/src/analyzer/params.ts +13 -55
- package/src/analyzer/sdk.ts +247 -0
- package/src/analyzer/typedeps.ts +22 -4
- package/src/bin.ts +31 -6
- package/src/config.ts +15 -0
- package/src/engine/analyze.ts +1110 -0
- package/src/engine/ast.ts +105 -0
- package/src/engine/file-order.ts +104 -0
- package/src/engine/host.ts +79 -0
- package/src/engine/index.ts +79 -0
- package/src/engine/ts-morph-compat-host.ts +20 -0
- package/src/engine/tsgo-host.ts +119 -0
- package/src/engine/typescript-host.ts +159 -0
- package/src/generator/genmodules.ts +9 -4
- package/src/generator/gentypes.ts +1 -1
- package/src/generator/index.ts +1 -1
- package/src/logging.ts +10 -1
- package/src/rtk-query-generator/genmodules.ts +17 -9
- package/src/rtk-query-generator/index.ts +2 -12
- package/src/rtk-query-generator/sdk-interface.ts +2 -3
- package/tsconfig.json +7 -6
- package/build/analyzer/decorator.d.ts +0 -10
- package/build/analyzer/decorator.js +0 -29
- package/build/rtk-query-generator/gentypes.d.ts +0 -10
- package/build/rtk-query-generator/gentypes.js +0 -62
- package/build/tsconfig.tsbuildinfo +0 -1
- package/bun.lockb +0 -0
- package/src/rtk-query-generator/gentypes.ts +0 -74
- package/tsconfig.tsbuildinfo +0 -1
|
@@ -0,0 +1,786 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
/**
|
|
3
|
+
* @file Source API analyzer running on top of an `AnalysisHost` (tsgo or in-process TypeScript)
|
|
4
|
+
*
|
|
5
|
+
* This is a port of the legacy ts-morph analyzer (`src/analyzer`). It performs the same operations, in the same
|
|
6
|
+
* order, with the same messages, so that given the same type checker it produces the same SDK content.
|
|
7
|
+
* The parity tests enforce this by running it against the TypeScript program ts-morph builds.
|
|
8
|
+
*/
|
|
9
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
12
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
13
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
14
|
+
}
|
|
15
|
+
Object.defineProperty(o, k2, desc);
|
|
16
|
+
}) : (function(o, m, k, k2) {
|
|
17
|
+
if (k2 === undefined) k2 = k;
|
|
18
|
+
o[k2] = m[k];
|
|
19
|
+
}));
|
|
20
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
21
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
22
|
+
}) : function(o, v) {
|
|
23
|
+
o["default"] = v;
|
|
24
|
+
});
|
|
25
|
+
var __importStar = (this && this.__importStar) || (function () {
|
|
26
|
+
var ownKeys = function(o) {
|
|
27
|
+
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
28
|
+
var ar = [];
|
|
29
|
+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
30
|
+
return ar;
|
|
31
|
+
};
|
|
32
|
+
return ownKeys(o);
|
|
33
|
+
};
|
|
34
|
+
return function (mod) {
|
|
35
|
+
if (mod && mod.__esModule) return mod;
|
|
36
|
+
var result = {};
|
|
37
|
+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
38
|
+
__setModuleDefault(result, mod);
|
|
39
|
+
return result;
|
|
40
|
+
};
|
|
41
|
+
})();
|
|
42
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
43
|
+
exports.analyzeWithHost = analyzeWithHost;
|
|
44
|
+
const fs = __importStar(require("fs"));
|
|
45
|
+
const os = __importStar(require("os"));
|
|
46
|
+
const path = __importStar(require("path"));
|
|
47
|
+
const chalk = require("chalk");
|
|
48
|
+
const builtin_1 = require("../analyzer/builtin");
|
|
49
|
+
const route_1 = require("../analyzer/route");
|
|
50
|
+
const sdk_1 = require("../analyzer/sdk");
|
|
51
|
+
const typedeps_1 = require("../analyzer/typedeps");
|
|
52
|
+
const logging_1 = require("../logging");
|
|
53
|
+
const utils_1 = require("../utils");
|
|
54
|
+
const ast_1 = require("./ast");
|
|
55
|
+
/**
|
|
56
|
+
* Analyze the source API
|
|
57
|
+
* @param config Generator configuration
|
|
58
|
+
* @param createHost Creates the engine for a given tsconfig file
|
|
59
|
+
*/
|
|
60
|
+
async function analyzeWithHost(config, createHost) {
|
|
61
|
+
const started = Date.now();
|
|
62
|
+
const sourcePath = path.resolve(process.cwd(), config.apiInputPath);
|
|
63
|
+
if (!sourcePath)
|
|
64
|
+
(0, logging_1.panic)('Please provide a source directory');
|
|
65
|
+
if (!fs.existsSync(sourcePath))
|
|
66
|
+
(0, logging_1.panic)('Provided source path {magentaBright} does not exist', sourcePath);
|
|
67
|
+
if (!fs.lstatSync(sourcePath).isDirectory())
|
|
68
|
+
(0, logging_1.panic)('Provided source path is not a directory');
|
|
69
|
+
(0, logging_1.debug)(`Analyzing from source directory {yellow}`, sourcePath);
|
|
70
|
+
if (config.jsonOutput) {
|
|
71
|
+
const jsonOutputParentDir = path.dirname(path.resolve(process.cwd(), config.jsonOutput));
|
|
72
|
+
if (!fs.existsSync(jsonOutputParentDir)) {
|
|
73
|
+
(0, logging_1.panic)("Output file's parent directory {magentaBright} does not exist.", jsonOutputParentDir);
|
|
74
|
+
}
|
|
75
|
+
(0, logging_1.debug)('Writing output to {yellow}', config.jsonOutput, config.jsonPrettyOutput ? 'beautified' : 'minified');
|
|
76
|
+
}
|
|
77
|
+
// ====== Find & parse 'tsconfig.json' ====== //
|
|
78
|
+
if (config.tsconfigFile && config.tsconfigFile.includes('/')) {
|
|
79
|
+
(0, logging_1.panic)('Provided tsconfig file name contains slashes');
|
|
80
|
+
}
|
|
81
|
+
const tsConfigFileName = config.tsconfigFile ?? 'tsconfig.json';
|
|
82
|
+
const tsConfigFilePath = path.join(sourcePath, tsConfigFileName);
|
|
83
|
+
if (!fs.existsSync(tsConfigFilePath)) {
|
|
84
|
+
(0, logging_1.panic)('No {yellow} file found in provided source path {yellow}', tsConfigFileName, sourcePath);
|
|
85
|
+
}
|
|
86
|
+
const host = createHost(tsConfigFilePath);
|
|
87
|
+
try {
|
|
88
|
+
// Get the list of all TypeScript files in the source directory
|
|
89
|
+
const sourceTSFiles = host.getProjectFilePaths().map((file) => path.relative(sourcePath, file));
|
|
90
|
+
(0, logging_1.debug)(`Found {magentaBright} source files.`, sourceTSFiles.length);
|
|
91
|
+
// Add them
|
|
92
|
+
(0, logging_1.debug)('\nAdding them to the source project...');
|
|
93
|
+
let progressByTenth = 0;
|
|
94
|
+
const strLen = sourceTSFiles.length.toString().length;
|
|
95
|
+
const hasProgress = (filesTreated) => filesTreated / sourceTSFiles.length >= (progressByTenth + 1) / 10;
|
|
96
|
+
const controllers = [];
|
|
97
|
+
for (let i = 0; i < sourceTSFiles.length; i++) {
|
|
98
|
+
const file = sourceTSFiles[i];
|
|
99
|
+
if (file.endsWith('.controller.ts')) {
|
|
100
|
+
controllers.push(file);
|
|
101
|
+
}
|
|
102
|
+
if (hasProgress(i + 1)) {
|
|
103
|
+
while (hasProgress(i + 1))
|
|
104
|
+
progressByTenth++;
|
|
105
|
+
(0, logging_1.debug)('| Progress: {yellow} ({magentaBright} files) - {green} controller{} found', (progressByTenth * 10).toString().padStart(3, ' ') + '%', `${(i + 1).toString().padStart(strLen, ' ')} / ${sourceTSFiles.length}`, controllers.length.toString().padStart(strLen, ''), controllers.length > 1 ? 's' : '');
|
|
106
|
+
}
|
|
107
|
+
}
|
|
108
|
+
(0, logging_1.debug)('All files were added successfully.\n');
|
|
109
|
+
const modules = analyzeControllers(host, controllers, sourcePath);
|
|
110
|
+
// Builtin magic types are concatenated **after** the configuration's ones, as this allows users to
|
|
111
|
+
// override the builtin ones if they want. Do **not** change the concatenation order!
|
|
112
|
+
const magicTypes = (config.magicTypes ?? []).concat(builtin_1.builtinMagicTypes);
|
|
113
|
+
const typesCache = new TypesExtractor(host, sourcePath, magicTypes);
|
|
114
|
+
const typesToExtract = (0, sdk_1.locateTypesFile)((0, sdk_1.flattenSdkResolvedTypes)(modules));
|
|
115
|
+
(0, logging_1.debug)('\n==== Extracting {} type' + (typesToExtract.length > 1 ? 's' : '') + ' ====\n', typesToExtract.length);
|
|
116
|
+
for (const loc of typesToExtract) {
|
|
117
|
+
const result = typesCache.extractType(loc);
|
|
118
|
+
if (result instanceof Error) {
|
|
119
|
+
(0, logging_1.panic)(result.message);
|
|
120
|
+
}
|
|
121
|
+
}
|
|
122
|
+
const content = {
|
|
123
|
+
modules,
|
|
124
|
+
types: typesCache.extracted,
|
|
125
|
+
};
|
|
126
|
+
if (config.jsonOutput) {
|
|
127
|
+
fs.writeFileSync(config.jsonOutput, (0, sdk_1.serializeSdkContent)(content, !!config.jsonPrettyOutput), 'utf8');
|
|
128
|
+
}
|
|
129
|
+
(0, logging_1.debug)('\n===== Done in {green}! ====', ((Date.now() - started) / 1000).toFixed(2) + 's');
|
|
130
|
+
return content;
|
|
131
|
+
}
|
|
132
|
+
finally {
|
|
133
|
+
host.dispose();
|
|
134
|
+
}
|
|
135
|
+
}
|
|
136
|
+
/**
|
|
137
|
+
* Get a source file from the program, throwing like ts-morph's `project.getSourceFileOrThrow()`
|
|
138
|
+
*/
|
|
139
|
+
function getSourceFileOrThrow(host, absolutePath) {
|
|
140
|
+
const file = host.getSourceFile(absolutePath);
|
|
141
|
+
if (!file) {
|
|
142
|
+
throw new Error(`Could not find source file in project at the provided path: ${absolutePath}`);
|
|
143
|
+
}
|
|
144
|
+
return file;
|
|
145
|
+
}
|
|
146
|
+
// =============================================================================================================== //
|
|
147
|
+
// Controllers & modules (see src/analyzer/controllers.ts, src/analyzer/controller.ts, src/analyzer/module.ts) //
|
|
148
|
+
// =============================================================================================================== //
|
|
149
|
+
function analyzeControllers(host, controllers, absoluteSrcPath) {
|
|
150
|
+
/** Hierarchised SDK informations */
|
|
151
|
+
const collected = new Map();
|
|
152
|
+
const usedControllerNames = new Set();
|
|
153
|
+
/**
|
|
154
|
+
* Modules cache: contains for a given directory the nearest module file's path and name
|
|
155
|
+
* This allows to avoid having to analyze the whole directory structure for each controller
|
|
156
|
+
*/
|
|
157
|
+
const modulesCache = new Map();
|
|
158
|
+
/**
|
|
159
|
+
* Path of the declared modules
|
|
160
|
+
* When a module is detected and put in the cache, its name is registered here along with its path
|
|
161
|
+
* This allows to ensure there is no name clash between two different modules
|
|
162
|
+
*/
|
|
163
|
+
const declaredModulesPath = new Map();
|
|
164
|
+
(0, logging_1.debug)(`Analyzing {yellow} controllers...`, controllers.length);
|
|
165
|
+
controllers.forEach((relativeControllerPath, i) => {
|
|
166
|
+
const absoluteControllerPath = path.resolve(absoluteSrcPath, relativeControllerPath);
|
|
167
|
+
(0, logging_1.debug)('\n{cyan} {yellow}: {magentaBright} {cyan}\n', '===== Analyzing controller', `${i + 1}/${controllers.length}`, relativeControllerPath, '=====');
|
|
168
|
+
const basePath = path.dirname(absoluteControllerPath);
|
|
169
|
+
let moduleName = modulesCache.get(basePath);
|
|
170
|
+
// Check if the module's name is in cache
|
|
171
|
+
if (!moduleName) {
|
|
172
|
+
// Else, find the nearest module file
|
|
173
|
+
const absoluteModulePath = (0, utils_1.findFileAbove)(/^.*\.module\.ts$/, path.resolve(absoluteSrcPath, basePath));
|
|
174
|
+
if (absoluteModulePath === null) {
|
|
175
|
+
(0, logging_1.panic)('No module file was found for controller at path: {yellow}', absoluteControllerPath);
|
|
176
|
+
}
|
|
177
|
+
const relativeModulePath = path.relative(absoluteSrcPath, absoluteModulePath);
|
|
178
|
+
// Get the module's name
|
|
179
|
+
moduleName = getModuleName(host, relativeModulePath, absoluteSrcPath);
|
|
180
|
+
(0, logging_1.debug)('Discovered module: {yellow}', moduleName);
|
|
181
|
+
// Ensure this module is unique
|
|
182
|
+
const cachedModulePath = declaredModulesPath.get(moduleName);
|
|
183
|
+
if (cachedModulePath) {
|
|
184
|
+
(0, logging_1.panic)(`Two modules were declared with the same name {yellow}:\n` + `- One in {yellow}\n` + `- One in {yellow}`, moduleName, cachedModulePath, relativeModulePath);
|
|
185
|
+
}
|
|
186
|
+
modulesCache.set(basePath, moduleName);
|
|
187
|
+
}
|
|
188
|
+
if (moduleName in {}) {
|
|
189
|
+
(0, logging_1.panic)(`Detected module whose name {yellow} collides with a JavaScript's native object property`, moduleName);
|
|
190
|
+
}
|
|
191
|
+
let moduleSdkInfos = collected.get(moduleName);
|
|
192
|
+
if (!moduleSdkInfos) {
|
|
193
|
+
moduleSdkInfos = new Map();
|
|
194
|
+
collected.set(moduleName, moduleSdkInfos);
|
|
195
|
+
}
|
|
196
|
+
if (i === 0) {
|
|
197
|
+
if (process.platform === 'linux' && os.release().toLocaleLowerCase().includes('microsoft') && absoluteSrcPath.startsWith('/mnt/')) {
|
|
198
|
+
(0, logging_1.warn)("NOTE: On WSL, the first type analysis on a project located in Windows's filesystem may take a long time to complete.");
|
|
199
|
+
(0, logging_1.warn)('Please consider moving your project to WSL, or running this tool directly from Windows');
|
|
200
|
+
}
|
|
201
|
+
}
|
|
202
|
+
const metadata = analyzeController(host, relativeControllerPath, absoluteSrcPath);
|
|
203
|
+
if (metadata instanceof Error) {
|
|
204
|
+
throw new Error((0, logging_1.format)('Failed to analyze controller at path {magenta}:\n{}', relativeControllerPath, metadata.message));
|
|
205
|
+
}
|
|
206
|
+
if (metadata) {
|
|
207
|
+
if (metadata.registrationName in {}) {
|
|
208
|
+
(0, logging_1.panic)(`Detected controller whose registration name {yellow} collides with a JavaScript's native object property`, metadata.registrationName);
|
|
209
|
+
}
|
|
210
|
+
// Ensure the each controller has a unique name across modules
|
|
211
|
+
if (usedControllerNames.has(metadata.className)) {
|
|
212
|
+
(0, logging_1.panic)(`Detected two controllers with the same name {yellow}. Second occurrence found in {yellow}`, metadata.registrationName, metadata.path);
|
|
213
|
+
}
|
|
214
|
+
else {
|
|
215
|
+
usedControllerNames.add(metadata.className);
|
|
216
|
+
}
|
|
217
|
+
moduleSdkInfos.set(metadata.className, metadata);
|
|
218
|
+
}
|
|
219
|
+
});
|
|
220
|
+
return collected;
|
|
221
|
+
}
|
|
222
|
+
function getModuleName(host, modulePath, sourcePath) {
|
|
223
|
+
const SK = host.SyntaxKind;
|
|
224
|
+
// Prepare the source file to analyze
|
|
225
|
+
const file = getSourceFileOrThrow(host, path.resolve(sourcePath, modulePath));
|
|
226
|
+
// Find the module class declaration
|
|
227
|
+
const classDecl = file.statements.find((node) => node.kind === SK.ClassDeclaration && (0, ast_1.getDecorators)(host, node).length > 0);
|
|
228
|
+
if (!classDecl) {
|
|
229
|
+
(0, logging_1.panic)('No class declaration found in module at {yellow}', modulePath);
|
|
230
|
+
}
|
|
231
|
+
const moduleName = (0, ast_1.nodeName)(classDecl, file);
|
|
232
|
+
if (moduleName === undefined) {
|
|
233
|
+
(0, logging_1.panic)('Internal error: failed to retrieve name of declared class');
|
|
234
|
+
}
|
|
235
|
+
const decorators = (0, ast_1.getDecorators)(host, classDecl);
|
|
236
|
+
const moduleDecorator = decorators.find((dec) => (0, ast_1.decoratorName)(host, dec, file) === 'Module');
|
|
237
|
+
if (!moduleDecorator) {
|
|
238
|
+
(0, logging_1.panic)((0, logging_1.format)(`Module class {yellow} is missing {yellow} decorator\nModule path is: {yellow}`, moduleName, '@Module', modulePath));
|
|
239
|
+
}
|
|
240
|
+
return moduleName;
|
|
241
|
+
}
|
|
242
|
+
function analyzeController(host, controllerPath, absoluteSrcPath) {
|
|
243
|
+
const SK = host.SyntaxKind;
|
|
244
|
+
(0, logging_1.debug)('Analyzing: {yellow}', controllerPath);
|
|
245
|
+
// Prepare the source file to analyze
|
|
246
|
+
const file = getSourceFileOrThrow(host, path.resolve(absoluteSrcPath, controllerPath));
|
|
247
|
+
// Find the controller class declaration
|
|
248
|
+
const classDecl = file.statements.find((node) => node.kind === SK.ClassDeclaration);
|
|
249
|
+
if (!classDecl) {
|
|
250
|
+
(0, logging_1.warn)('No controller found in this file.');
|
|
251
|
+
return null;
|
|
252
|
+
}
|
|
253
|
+
const className = (0, ast_1.nodeName)(classDecl, file);
|
|
254
|
+
if (className === undefined) {
|
|
255
|
+
return new Error('Internal error: failed to retrieve name of declared class');
|
|
256
|
+
}
|
|
257
|
+
// By default, a controller is registered under its class name
|
|
258
|
+
// This is unless it provides an argument to its @Controller() decorator
|
|
259
|
+
let registrationName = (0, sdk_1.camelcase)(className);
|
|
260
|
+
let controllerUriPrefix = null;
|
|
261
|
+
(0, logging_1.debug)('Found class declaration: {yellow}', className);
|
|
262
|
+
// Get the @Controller() decorator
|
|
263
|
+
const decorator = (0, ast_1.getDecorators)(host, classDecl).find((dec) => (0, ast_1.decoratorName)(host, dec, file) === 'Controller');
|
|
264
|
+
if (!decorator) {
|
|
265
|
+
(0, logging_1.warn)('Skipping this controller as it does not have a @Controller() decorator');
|
|
266
|
+
return null;
|
|
267
|
+
}
|
|
268
|
+
// Get the decorator's call expression
|
|
269
|
+
const decCallExpr = (0, ast_1.decoratorCallExpression)(host, decorator);
|
|
270
|
+
if (!decCallExpr) {
|
|
271
|
+
(0, logging_1.warn)('Skipping this controller as its @Controller() decorator is not called');
|
|
272
|
+
return null;
|
|
273
|
+
}
|
|
274
|
+
// Get the decorator's arguments
|
|
275
|
+
const decExpr = decCallExpr.arguments;
|
|
276
|
+
if (decExpr.length > 1) {
|
|
277
|
+
(0, logging_1.warn)('Skipping this controller as its @Controller() decorator is called with more than 1 argument');
|
|
278
|
+
return null;
|
|
279
|
+
}
|
|
280
|
+
// Get the first argument, which is expected to be the controller's registration name
|
|
281
|
+
// Example: `@Controller("SuperName")` will register the controller under the name "SuperName"
|
|
282
|
+
if (decExpr[0]) {
|
|
283
|
+
const nameArg = decExpr[0];
|
|
284
|
+
// Variables are not supported
|
|
285
|
+
if (!(0, ast_1.isStringLiteral)(host, nameArg)) {
|
|
286
|
+
(0, logging_1.warn)("Skipping this controller as its @Controller() decorator's argument is not a string literal");
|
|
287
|
+
return null;
|
|
288
|
+
}
|
|
289
|
+
// Update the registration name
|
|
290
|
+
registrationName = nameArg.text;
|
|
291
|
+
controllerUriPrefix = registrationName;
|
|
292
|
+
(0, logging_1.debug)('Registering controller {yellow} as {yellow} (as specified in @Controller())', className, registrationName);
|
|
293
|
+
}
|
|
294
|
+
else {
|
|
295
|
+
// No argument was provided to the @Controller() decorator, so we stick with the original controller's name
|
|
296
|
+
(0, logging_1.debug)('@Controller() was called without argument, registering controller under name {yellow}', registrationName);
|
|
297
|
+
}
|
|
298
|
+
// Generate a SDK interface for the controller's methods
|
|
299
|
+
const methods = analyzeMethods(host, file, classDecl, controllerUriPrefix, controllerPath, absoluteSrcPath);
|
|
300
|
+
if (methods instanceof Error) {
|
|
301
|
+
return methods;
|
|
302
|
+
}
|
|
303
|
+
// Success!
|
|
304
|
+
(0, logging_1.debug)(`└─ Done for controller {yellow}`, controllerPath);
|
|
305
|
+
return {
|
|
306
|
+
path: controllerPath,
|
|
307
|
+
className,
|
|
308
|
+
registrationName,
|
|
309
|
+
methods,
|
|
310
|
+
};
|
|
311
|
+
}
|
|
312
|
+
// =============================================================================================================== //
|
|
313
|
+
// Methods & parameters (see src/analyzer/methods.ts, src/analyzer/params.ts) //
|
|
314
|
+
// =============================================================================================================== //
|
|
315
|
+
function analyzeMethods(host, sourceFile, controllerClass, controllerUriPrefix, filePath, absoluteSrcPath) {
|
|
316
|
+
// Output variable
|
|
317
|
+
const collected = new Array();
|
|
318
|
+
// Get the list of all methods
|
|
319
|
+
const methods = controllerClass.members.filter((node) => node.kind === host.SyntaxKind.MethodDeclaration);
|
|
320
|
+
for (const method of methods) {
|
|
321
|
+
const methodName = (0, ast_1.nodeName)(method, sourceFile);
|
|
322
|
+
(0, logging_1.debug)('├─ Found method: {yellow}', methodName);
|
|
323
|
+
// Get the HTTP decorator(s) of the method
|
|
324
|
+
const decorators = (0, ast_1.getDecorators)(host, method).filter((dec) => Object.keys(sdk_1.SdkHttpMethod).includes((0, ast_1.decoratorName)(host, dec, sourceFile)));
|
|
325
|
+
// We expect to have exactly one HTTP decorator
|
|
326
|
+
if (decorators.length > 1) {
|
|
327
|
+
// If there is more than one decorator, that's invalid, so we can't analyze the method
|
|
328
|
+
return new Error((0, logging_1.format)('├─── Detected multiple HTTP decorators on method: {yellow}' +
|
|
329
|
+
decorators.map((dec) => (0, ast_1.decoratorName)(host, dec, sourceFile)).join(',')));
|
|
330
|
+
}
|
|
331
|
+
else if (decorators.length === 0) {
|
|
332
|
+
// If there isn't any HTTP decorator, this is simply not a method available from the outside and so we won't generate an interface for it
|
|
333
|
+
(0, logging_1.debug)('├─── Skipping this method as it does not have an HTTP decorator');
|
|
334
|
+
continue;
|
|
335
|
+
}
|
|
336
|
+
// Get the HTTP decorator
|
|
337
|
+
const dec = decorators[0];
|
|
338
|
+
const httpMethod = sdk_1.SdkHttpMethod[(0, ast_1.decoratorName)(host, dec, sourceFile)];
|
|
339
|
+
(0, logging_1.debug)('├─── Detected HTTP method: {magentaBright}', httpMethod.toLocaleUpperCase());
|
|
340
|
+
// Get the arguments provided to the HTTP decorator (we expect one, the URI path)
|
|
341
|
+
const decArgs = (0, ast_1.decoratorArguments)(host, dec);
|
|
342
|
+
// The method's URI path
|
|
343
|
+
let uriPath;
|
|
344
|
+
// We expect the decorator to have exactly one argument
|
|
345
|
+
if (decArgs.length > 1) {
|
|
346
|
+
// If we have more than one argument, that's invalid (or at least not supported here), so we can't analyze the method
|
|
347
|
+
return new Error(`Multiple (${decArgs.length}) arguments were provided to the HTTP decorator`);
|
|
348
|
+
}
|
|
349
|
+
else if (decArgs.length === 0) {
|
|
350
|
+
// If there is no argument, we take the method's name as the URI path
|
|
351
|
+
(0, logging_1.debug)('├─── No argument found for decorator, using base URI path.');
|
|
352
|
+
uriPath = '';
|
|
353
|
+
}
|
|
354
|
+
else {
|
|
355
|
+
// If we have exactly one argument, hurray! That's our URI path.
|
|
356
|
+
const uriNameDec = decArgs[0];
|
|
357
|
+
// Variables are not supported
|
|
358
|
+
if (!(0, ast_1.isStringLiteral)(host, uriNameDec)) {
|
|
359
|
+
return new Error((0, logging_1.format)('├─── The argument provided to the HTTP decorator is not a string literal:\n>> {cyan}', (0, ast_1.nodeText)(uriNameDec, sourceFile)));
|
|
360
|
+
}
|
|
361
|
+
// Update the method's URI path
|
|
362
|
+
uriPath = uriNameDec.text;
|
|
363
|
+
(0, logging_1.debug)('├─── Detected argument in HTTP decorator, mapping this method to custom URI name');
|
|
364
|
+
}
|
|
365
|
+
(0, logging_1.debug)('├─── Detected URI name: {yellow}', uriPath);
|
|
366
|
+
// Analyze the method's URI
|
|
367
|
+
const route = (0, route_1.analyzeUri)(controllerUriPrefix ? (uriPath ? `/${controllerUriPrefix}/${uriPath}` : `/` + controllerUriPrefix) : uriPath);
|
|
368
|
+
if (route instanceof Error) {
|
|
369
|
+
return new Error('├─── Detected unsupported URI format:\n' +
|
|
370
|
+
route.message
|
|
371
|
+
.split('\n')
|
|
372
|
+
.map((line) => '├───── ' + line)
|
|
373
|
+
.join('\n'));
|
|
374
|
+
}
|
|
375
|
+
(0, logging_1.debug)('├─── Parsed URI name to route: {yellow}', (0, route_1.debugUri)(route, chalk.blue));
|
|
376
|
+
// Analyze the method's arguments
|
|
377
|
+
(0, logging_1.debug)('├─── Analyzing arguments...');
|
|
378
|
+
const params = extractParams({ host, sourceFile, controllerClass, httpMethod, route, method, filePath, absoluteSrcPath });
|
|
379
|
+
// Get the method's return type
|
|
380
|
+
(0, logging_1.debug)('├─── Resolving return type...');
|
|
381
|
+
const returnType = (0, typedeps_1.resolveTypeTextDependencies)(host.typeToString(host.getReturnTypeOfDeclaration(method)), filePath, absoluteSrcPath);
|
|
382
|
+
(0, logging_1.debug)('├─── Detected return type: {cyan}', returnType.resolvedType);
|
|
383
|
+
// Success!
|
|
384
|
+
collected.push({
|
|
385
|
+
name: methodName,
|
|
386
|
+
httpMethod,
|
|
387
|
+
returnType,
|
|
388
|
+
route,
|
|
389
|
+
uriPath,
|
|
390
|
+
params,
|
|
391
|
+
});
|
|
392
|
+
}
|
|
393
|
+
return collected;
|
|
394
|
+
}
|
|
395
|
+
function extractParams(context) {
|
|
396
|
+
const { httpMethod, route } = context;
|
|
397
|
+
const { Body, Param, Query } = extractDecoratedArgs(context);
|
|
398
|
+
const resolvedParams = {
|
|
399
|
+
routeParams: mergeDecoratedArgs(Param),
|
|
400
|
+
queryParams: mergeDecoratedArgs(Query),
|
|
401
|
+
bodyParams: mergeDecoratedArgs(Body),
|
|
402
|
+
context,
|
|
403
|
+
};
|
|
404
|
+
/**
|
|
405
|
+
* Validate Body Params are not used in GET requests
|
|
406
|
+
*/
|
|
407
|
+
if (httpMethod === sdk_1.SdkHttpMethod.Get && resolvedParams.bodyParams) {
|
|
408
|
+
panicWithContext(`${httpMethod} request should not have @Body params, use @Query params instead`, context);
|
|
409
|
+
}
|
|
410
|
+
/**
|
|
411
|
+
* Validate Query Params are not used in non-GET requests
|
|
412
|
+
*/
|
|
413
|
+
if (httpMethod !== sdk_1.SdkHttpMethod.Get && resolvedParams.queryParams) {
|
|
414
|
+
panicWithContext(`${httpMethod} request should not have @Query params, use @Body params instead`, context);
|
|
415
|
+
}
|
|
416
|
+
/**
|
|
417
|
+
* Validate Route Params exist in route URL
|
|
418
|
+
*/
|
|
419
|
+
const { routeParams } = resolvedParams;
|
|
420
|
+
if (routeParams) {
|
|
421
|
+
const allowedRouteParams = new Set((0, route_1.paramsFromRoute)(route));
|
|
422
|
+
// Like the legacy analyzer, this checks the keys of the resolved params object. For a generic `@Param()` argument,
|
|
423
|
+
// these are the keys of the resolved type's description (rawType, resolvedType...), which are rejected.
|
|
424
|
+
const usedRouteParams = Object.keys(routeParams);
|
|
425
|
+
for (const usedParam of usedRouteParams) {
|
|
426
|
+
if (!allowedRouteParams.has(usedParam)) {
|
|
427
|
+
panicWithContext(`Route param ${usedParam} does not appear in route URL`, context);
|
|
428
|
+
}
|
|
429
|
+
}
|
|
430
|
+
}
|
|
431
|
+
return resolvedParams;
|
|
432
|
+
}
|
|
433
|
+
function extractDecoratedArgs(context) {
|
|
434
|
+
const decoratedArgs = {
|
|
435
|
+
[sdk_1.ArgDecorator.Param]: [],
|
|
436
|
+
[sdk_1.ArgDecorator.Query]: [],
|
|
437
|
+
[sdk_1.ArgDecorator.Body]: [],
|
|
438
|
+
};
|
|
439
|
+
const { controllerClass, host, method, sourceFile } = context;
|
|
440
|
+
const args = method.parameters;
|
|
441
|
+
for (const arg of args) {
|
|
442
|
+
const argName = (0, ast_1.nodeName)(arg, sourceFile);
|
|
443
|
+
(0, logging_1.debug)('├───── Detected argument: {yellow}', argName);
|
|
444
|
+
// Arguments are collected as soon as they have a decorator like @Query() or @Body()
|
|
445
|
+
const argDecorators = (0, ast_1.getDecorators)(host, arg).filter((dec) => Object.values(sdk_1.ArgDecorator).includes((0, ast_1.decoratorName)(host, dec, sourceFile)));
|
|
446
|
+
if (argDecorators.length === 0) {
|
|
447
|
+
// If we have no argument, this is not an argument we are interested in, so we just skip it
|
|
448
|
+
(0, logging_1.debug)('├───── Skipping this argument as it does not have a decorator');
|
|
449
|
+
continue;
|
|
450
|
+
}
|
|
451
|
+
else if (argDecorators.length > 1) {
|
|
452
|
+
(0, logging_1.panic)(`${(0, ast_1.nodeName)(controllerClass, sourceFile)} ${(0, ast_1.nodeName)(method, sourceFile)} has multiple decorators on argument ${argName} ${argDecorators
|
|
453
|
+
.map((dec) => (0, ast_1.decoratorName)(host, dec, sourceFile))
|
|
454
|
+
.join(', ')}`);
|
|
455
|
+
}
|
|
456
|
+
// Get the only decrator
|
|
457
|
+
const decorator = argDecorators[0];
|
|
458
|
+
const decoratorType = (0, ast_1.decoratorName)(host, decorator, sourceFile);
|
|
459
|
+
const argParamKey = extractArgParamKey({ ...context, arg, decorator });
|
|
460
|
+
const argType = host.getTypeAtLocation(arg);
|
|
461
|
+
if (!argParamKey && !host.isObjectType(argType)) {
|
|
462
|
+
(0, logging_1.panic)(`${(0, ast_1.nodeName)(controllerClass, sourceFile)} ${(0, ast_1.nodeName)(method, sourceFile)} generic controller argument ${decoratorType}() ${argName} must be an object type`);
|
|
463
|
+
}
|
|
464
|
+
decoratedArgs[decoratorType].push({
|
|
465
|
+
arg,
|
|
466
|
+
argParamKey,
|
|
467
|
+
decorator,
|
|
468
|
+
decoratorType,
|
|
469
|
+
context,
|
|
470
|
+
});
|
|
471
|
+
}
|
|
472
|
+
return decoratedArgs;
|
|
473
|
+
}
|
|
474
|
+
function extractArgParamKey(context) {
|
|
475
|
+
const { arg, controllerClass, decorator, host, method, sourceFile } = context;
|
|
476
|
+
const decoratorArgs = (0, ast_1.decoratorArguments)(host, decorator);
|
|
477
|
+
if (decoratorArgs.length > 1) {
|
|
478
|
+
(0, logging_1.panic)(`${(0, ast_1.nodeName)(controllerClass, sourceFile)} ${(0, ast_1.nodeName)(method, sourceFile)} ${(0, ast_1.decoratorName)(host, decorator, sourceFile)}() ${(0, ast_1.nodeName)(arg, sourceFile)} argument decorator has multiple parameters`);
|
|
479
|
+
}
|
|
480
|
+
else if (decoratorArgs.length === 0) {
|
|
481
|
+
return null;
|
|
482
|
+
}
|
|
483
|
+
const decoratorArg = decoratorArgs[0];
|
|
484
|
+
if (!(0, ast_1.isStringLiteral)(host, decoratorArg)) {
|
|
485
|
+
(0, logging_1.panic)('The argument provided to the decorator is not a string literal:\n>>> {cyan}', (0, ast_1.nodeText)(arg, sourceFile));
|
|
486
|
+
}
|
|
487
|
+
const paramKey = decoratorArg.text;
|
|
488
|
+
if (paramKey in {}) {
|
|
489
|
+
panicWithContext(`${(0, ast_1.decoratorName)(host, decorator, sourceFile)}('${paramKey}') param name collides with JavaScript native object property`, context);
|
|
490
|
+
}
|
|
491
|
+
return paramKey;
|
|
492
|
+
}
|
|
493
|
+
function mergeDecoratedArgs(decoratedArgs) {
|
|
494
|
+
let genericParam = null;
|
|
495
|
+
const paramMap = {};
|
|
496
|
+
for (const decoratedArg of decoratedArgs) {
|
|
497
|
+
const { arg, argParamKey, context, decoratorType } = decoratedArg;
|
|
498
|
+
const resolvedType = (0, typedeps_1.resolveTypeTextDependencies)(context.host.typeToString(context.host.getTypeAtLocation(arg)), context.filePath, context.absoluteSrcPath);
|
|
499
|
+
if (argParamKey) {
|
|
500
|
+
if (paramMap[argParamKey]) {
|
|
501
|
+
panicWithContext(`${decoratorType}('${argParamKey}') used twice in controller method`, decoratedArg.context);
|
|
502
|
+
}
|
|
503
|
+
paramMap[argParamKey] = resolvedType;
|
|
504
|
+
}
|
|
505
|
+
else {
|
|
506
|
+
if (genericParam) {
|
|
507
|
+
panicWithContext(`${decoratorType}() used twice in controller method`, decoratedArg.context);
|
|
508
|
+
}
|
|
509
|
+
genericParam = resolvedType;
|
|
510
|
+
}
|
|
511
|
+
}
|
|
512
|
+
const hasArgsByKey = Object.keys(paramMap).length > 0;
|
|
513
|
+
if (genericParam && hasArgsByKey) {
|
|
514
|
+
panicWithContext(`Cannot mix generic and specific ${decoratedArgs[0].decoratorType}()`, decoratedArgs[0].context);
|
|
515
|
+
}
|
|
516
|
+
return hasArgsByKey ? paramMap : genericParam;
|
|
517
|
+
}
|
|
518
|
+
const panicWithContext = (message, context) => {
|
|
519
|
+
const { controllerClass, filePath, httpMethod, method, sourceFile } = context;
|
|
520
|
+
const ctx = {
|
|
521
|
+
controller: (0, ast_1.nodeName)(controllerClass, sourceFile),
|
|
522
|
+
method: (0, ast_1.nodeName)(method, sourceFile),
|
|
523
|
+
httpMethod,
|
|
524
|
+
filePath,
|
|
525
|
+
};
|
|
526
|
+
(0, logging_1.panic)(`${message}\n${JSON.stringify(ctx, null, 2)}`);
|
|
527
|
+
};
|
|
528
|
+
// =============================================================================================================== //
|
|
529
|
+
// Types extraction (see src/analyzer/extractor.ts, src/analyzer/classdeps.ts) //
|
|
530
|
+
// =============================================================================================================== //
|
|
531
|
+
function analyzeClassDeps(host, decl, sourceFile, relativeFilePath, absoluteSrcPath) {
|
|
532
|
+
if (path.isAbsolute(relativeFilePath)) {
|
|
533
|
+
(0, logging_1.unreachable)('Internal error: got absolute file path in class dependencies analyzer, when expecting a relative one (got {magentaBright})', relativeFilePath);
|
|
534
|
+
}
|
|
535
|
+
const toLookup = new Array();
|
|
536
|
+
for (const sup of (0, ast_1.getExtendsTypeNodes)(host, decl)) {
|
|
537
|
+
toLookup.push(host.getTypeAtLocation(sup));
|
|
538
|
+
}
|
|
539
|
+
for (const prop of (0, ast_1.getDeclarationProperties)(host, decl, sourceFile)) {
|
|
540
|
+
toLookup.push(host.getTypeAtLocation(prop));
|
|
541
|
+
}
|
|
542
|
+
return toLookup.map((type) => (0, typedeps_1.resolveTypeTextDependencies)(host.typeToString(type), relativeFilePath, absoluteSrcPath));
|
|
543
|
+
}
|
|
544
|
+
/**
|
|
545
|
+
* Types extractor
|
|
546
|
+
*/
|
|
547
|
+
class TypesExtractor {
|
|
548
|
+
host;
|
|
549
|
+
absoluteSrcPath;
|
|
550
|
+
magicTypes;
|
|
551
|
+
extracted;
|
|
552
|
+
constructor(
|
|
553
|
+
/** Analysis engine */
|
|
554
|
+
host,
|
|
555
|
+
/** Absolute source path */
|
|
556
|
+
absoluteSrcPath,
|
|
557
|
+
/** Magic types to replace non-portable types */
|
|
558
|
+
magicTypes,
|
|
559
|
+
/** Extracted types */
|
|
560
|
+
extracted = new Map()) {
|
|
561
|
+
this.host = host;
|
|
562
|
+
this.absoluteSrcPath = absoluteSrcPath;
|
|
563
|
+
this.magicTypes = magicTypes;
|
|
564
|
+
this.extracted = extracted;
|
|
565
|
+
}
|
|
566
|
+
/**
|
|
567
|
+
* Find if a type has previously been extracted, without providing its extension
|
|
568
|
+
* @param loc
|
|
569
|
+
* @returns
|
|
570
|
+
*/
|
|
571
|
+
findExtractedTypeWithoutExt(loc) {
|
|
572
|
+
for (const ext of sdk_1.MODULE_EXTENSIONS) {
|
|
573
|
+
const typ = this.extracted.get(loc.relativePathNoExt + ext)?.get(loc.typename);
|
|
574
|
+
if (typ) {
|
|
575
|
+
return typ;
|
|
576
|
+
}
|
|
577
|
+
}
|
|
578
|
+
return null;
|
|
579
|
+
}
|
|
580
|
+
/**
|
|
581
|
+
* Find the relative file location of a type
|
|
582
|
+
* @param loc
|
|
583
|
+
* @returns
|
|
584
|
+
*/
|
|
585
|
+
findTypeRelativeFilePath(loc) {
|
|
586
|
+
if (path.isAbsolute(loc.relativePathNoExt)) {
|
|
587
|
+
(0, logging_1.unreachable)('Internal error: got absolute file path in types extractor, when expecting a relative one (got {magentaBright})', loc.relativePathNoExt);
|
|
588
|
+
}
|
|
589
|
+
const absolutePathNoExt = path.resolve(this.absoluteSrcPath, loc.relativePathNoExt);
|
|
590
|
+
const cached = this.findExtractedTypeWithoutExt(loc);
|
|
591
|
+
if (cached) {
|
|
592
|
+
return cached.relativePath;
|
|
593
|
+
}
|
|
594
|
+
let relativeFilePath = null;
|
|
595
|
+
for (const ext of sdk_1.MODULE_EXTENSIONS) {
|
|
596
|
+
if (this.host.getSourceFile(absolutePathNoExt + ext)) {
|
|
597
|
+
relativeFilePath = loc.relativePathNoExt + ext;
|
|
598
|
+
}
|
|
599
|
+
}
|
|
600
|
+
return (relativeFilePath ??
|
|
601
|
+
new Error((0, logging_1.format)('File {magenta} was not found (was expected to contain dependency type {yellow})', loc.relativePathNoExt, loc.typename)));
|
|
602
|
+
}
|
|
603
|
+
/**
|
|
604
|
+
* Extract a type
|
|
605
|
+
* @param loc
|
|
606
|
+
* @param typesPath
|
|
607
|
+
* @returns
|
|
608
|
+
*/
|
|
609
|
+
extractType(loc, typesPath = []) {
|
|
610
|
+
const { host } = this;
|
|
611
|
+
const SK = host.SyntaxKind;
|
|
612
|
+
if (path.isAbsolute(loc.relativePathNoExt)) {
|
|
613
|
+
(0, logging_1.unreachable)('Internal error: got absolute file path in types extractor, when expecting a relative one (got {magentaBright})', loc.relativePathNoExt);
|
|
614
|
+
}
|
|
615
|
+
// Get the absolute path of the type's parent file
|
|
616
|
+
// We don't know its extension yet as imported file names in import statements don't have an extension
|
|
617
|
+
const absolutePathNoExt = path.resolve(this.absoluteSrcPath, loc.relativePathNoExt);
|
|
618
|
+
// If the type is already in cache, return it directly
|
|
619
|
+
const cached = this.findExtractedTypeWithoutExt(loc);
|
|
620
|
+
if (cached) {
|
|
621
|
+
return cached;
|
|
622
|
+
}
|
|
623
|
+
// Try to find the path with extension of the file and get it as a source file
|
|
624
|
+
// (like the legacy analyzer, the last matching extension wins)
|
|
625
|
+
let fileAndPath = null;
|
|
626
|
+
for (const ext of sdk_1.MODULE_EXTENSIONS) {
|
|
627
|
+
const sourceFile = host.getSourceFile(absolutePathNoExt + ext);
|
|
628
|
+
if (sourceFile) {
|
|
629
|
+
fileAndPath = [sourceFile, loc.relativePathNoExt + ext];
|
|
630
|
+
}
|
|
631
|
+
}
|
|
632
|
+
if (!fileAndPath) {
|
|
633
|
+
return new Error((0, logging_1.format)('File {magenta} was not found (was expected to contain dependency type {yellow})', loc.relativePathNoExt, loc.typename));
|
|
634
|
+
}
|
|
635
|
+
const [file, relativeFilePath] = fileAndPath;
|
|
636
|
+
// Use magic types to replace non-portable types
|
|
637
|
+
for (const magicType of this.magicTypes) {
|
|
638
|
+
if (relativeFilePath.endsWith(`node_modules/${magicType.nodeModuleFilePath}`) && loc.typename === magicType.typeName) {
|
|
639
|
+
(0, logging_1.debug)('-> '.repeat(typesPath.length + 1) +
|
|
640
|
+
'Found magic type {yellow} from external module file {magentaBright}, using provided placeholder.', loc.typename, relativeFilePath);
|
|
641
|
+
const extracted = {
|
|
642
|
+
content: '/** @file Magic placeholder from configuration file */\n\n' + magicType.placeholderContent,
|
|
643
|
+
relativePath: relativeFilePath,
|
|
644
|
+
relativePathNoExt: loc.relativePathNoExt,
|
|
645
|
+
typename: loc.typename,
|
|
646
|
+
typeParams: [],
|
|
647
|
+
dependencies: [],
|
|
648
|
+
};
|
|
649
|
+
typesPath.pop();
|
|
650
|
+
let types = this.extracted.get(relativeFilePath);
|
|
651
|
+
if (!types) {
|
|
652
|
+
types = new Map();
|
|
653
|
+
this.extracted.set(relativeFilePath, types);
|
|
654
|
+
}
|
|
655
|
+
types.set(loc.typename, extracted);
|
|
656
|
+
return extracted;
|
|
657
|
+
}
|
|
658
|
+
}
|
|
659
|
+
(0, logging_1.debug)('-> '.repeat(typesPath.length + 1) + 'Extracting type {yellow} from file {magentaBright}...', loc.typename, relativeFilePath);
|
|
660
|
+
// Analyze the type's declaration
|
|
661
|
+
const decl = file.statements.find((node) => {
|
|
662
|
+
return ((node.kind === SK.EnumDeclaration ||
|
|
663
|
+
node.kind === SK.TypeAliasDeclaration ||
|
|
664
|
+
node.kind === SK.InterfaceDeclaration ||
|
|
665
|
+
node.kind === SK.ClassDeclaration ||
|
|
666
|
+
node.kind === SK.FunctionDeclaration) &&
|
|
667
|
+
(0, ast_1.nodeName)(node, file) === loc.typename);
|
|
668
|
+
});
|
|
669
|
+
if (!decl) {
|
|
670
|
+
return new Error((0, logging_1.format)(`Type {yellow} was not found in file {magenta}`, loc.typename, relativeFilePath));
|
|
671
|
+
}
|
|
672
|
+
// Handle a limitation of the tool: you can't import two types from two files at the same path with just two different extensions
|
|
673
|
+
// Example: importing a type named "User" from two files in the same directory called "user.entity.ts" and "user.entity.js"
|
|
674
|
+
const typ = this.findExtractedTypeWithoutExt(loc);
|
|
675
|
+
if (typ && typ.relativePath !== relativeFilePath) {
|
|
676
|
+
(0, logging_1.panic)('Found two conflicting files at same path but with different extensions:\n> {magentaBright}\n> {magentaBright}', typ.relativePath, relativeFilePath);
|
|
677
|
+
}
|
|
678
|
+
/** Resolved type's dependencies */
|
|
679
|
+
let resolvedDeps;
|
|
680
|
+
/** Type's parameters (e.g. <T>) */
|
|
681
|
+
let typeParams;
|
|
682
|
+
/** Type declaration */
|
|
683
|
+
let extractedDecl = (0, ast_1.nodeText)(decl, file);
|
|
684
|
+
// Handle enumerations
|
|
685
|
+
if (decl.kind === SK.EnumDeclaration) {
|
|
686
|
+
resolvedDeps = [];
|
|
687
|
+
typeParams = [];
|
|
688
|
+
}
|
|
689
|
+
// Handle type aliases
|
|
690
|
+
else if (decl.kind === SK.TypeAliasDeclaration) {
|
|
691
|
+
resolvedDeps = [(0, typedeps_1.resolveTypeTextDependencies)(host.typeToString(host.getTypeAtLocation(decl)), relativeFilePath, this.absoluteSrcPath)];
|
|
692
|
+
typeParams = [];
|
|
693
|
+
}
|
|
694
|
+
// Handle interfaces
|
|
695
|
+
else if (decl.kind === SK.InterfaceDeclaration) {
|
|
696
|
+
resolvedDeps = analyzeClassDeps(host, decl, file, relativeFilePath, this.absoluteSrcPath);
|
|
697
|
+
typeParams = (decl.typeParameters ?? []).map((tp) => (0, ast_1.nodeText)(tp, file));
|
|
698
|
+
}
|
|
699
|
+
// Handle classes
|
|
700
|
+
// Methods are not handled because they shouldn't be used as DTOs and won't be decodable from JSON in all cases
|
|
701
|
+
// This part is tricky as we remake the class from scratch using the informations we have on it, given we have to get rid
|
|
702
|
+
// of methods as well as removing decorators
|
|
703
|
+
else if (decl.kind === SK.ClassDeclaration) {
|
|
704
|
+
const classHead = (0, ast_1.nodeText)(decl, file).match(/\b(export[^{]+class[^{]+{)/);
|
|
705
|
+
if (!classHead) {
|
|
706
|
+
(0, logging_1.unreachable)('Internal error: failed to match class head in declaration: {yellow}', (0, ast_1.nodeText)(decl, file));
|
|
707
|
+
}
|
|
708
|
+
extractedDecl = classHead[1];
|
|
709
|
+
const index = host.getIndexType(host.getTypeAtLocation(decl), 'string') ?? host.getIndexType(host.getTypeAtLocation(decl), 'number');
|
|
710
|
+
if (index) {
|
|
711
|
+
extractedDecl += '\npublic [input: string | number]: ' + (0, typedeps_1.getImportResolvedTypeText)(host.typeToString(index));
|
|
712
|
+
}
|
|
713
|
+
// Export all members
|
|
714
|
+
for (const member of (0, ast_1.getClassMembers)(host, decl, file)) {
|
|
715
|
+
if (member.kind !== SK.PropertyDeclaration) {
|
|
716
|
+
(0, logging_1.warn)('Found non-property member in class {cyan}: {magenta}', (0, ast_1.nodeName)(decl, file) ?? '<anonymous>', (0, ast_1.nodeText)(member, file));
|
|
717
|
+
continue;
|
|
718
|
+
}
|
|
719
|
+
const memberType = host.getTypeAtLocation(member);
|
|
720
|
+
const memberText = (0, ast_1.nodeText)(member, file);
|
|
721
|
+
extractedDecl += `\npublic ${(0, ast_1.nodeName)(member, file)}${memberText.includes('?') ? '?' : memberText.includes('!:') ? '!' : ''}: ${(0, typedeps_1.getImportResolvedTypeText)(host.typeToString(memberType))};`;
|
|
722
|
+
}
|
|
723
|
+
extractedDecl += '\n}';
|
|
724
|
+
resolvedDeps = analyzeClassDeps(host, decl, file, relativeFilePath, this.absoluteSrcPath);
|
|
725
|
+
typeParams = (decl.typeParameters ?? []).map((tp) => (0, ast_1.nodeText)(tp, file));
|
|
726
|
+
}
|
|
727
|
+
// Handle functions
|
|
728
|
+
else if (decl.kind === SK.FunctionDeclaration) {
|
|
729
|
+
resolvedDeps = [];
|
|
730
|
+
typeParams = [];
|
|
731
|
+
}
|
|
732
|
+
// Handle unknown types
|
|
733
|
+
else {
|
|
734
|
+
(0, logging_1.panic)('Unknown node type when extracting types: ' + decl.kind);
|
|
735
|
+
}
|
|
736
|
+
/** Normalized dependencies */
|
|
737
|
+
const dependencies = [];
|
|
738
|
+
// Ensure we're not stuck in an infinite loop where we analyze a type A, then its dependency B, which itself depends on A, and so on
|
|
739
|
+
if (typesPath.includes(loc.typename)) {
|
|
740
|
+
(0, logging_1.unreachable)(`Internal error: infinite loop detected in types extracted: {yellow}`, typesPath.join(' -> '));
|
|
741
|
+
}
|
|
742
|
+
typesPath.push(loc.typename);
|
|
743
|
+
// Analyze all dependencies
|
|
744
|
+
for (const dependencyLoc of (0, sdk_1.locateTypesFile)(resolvedDeps)) {
|
|
745
|
+
// If the "dependency" is one of the type's parameters (e.g. "T"), ignore this part
|
|
746
|
+
if (typeParams.includes(dependencyLoc.typename)) {
|
|
747
|
+
continue;
|
|
748
|
+
}
|
|
749
|
+
// Find the dependency's relative path
|
|
750
|
+
let relativePath;
|
|
751
|
+
const cached = this.findExtractedTypeWithoutExt(dependencyLoc);
|
|
752
|
+
if (cached) {
|
|
753
|
+
relativePath = cached.relativePath;
|
|
754
|
+
}
|
|
755
|
+
else if (typesPath.includes(dependencyLoc.typename)) {
|
|
756
|
+
relativePath = this.findTypeRelativeFilePath(dependencyLoc);
|
|
757
|
+
}
|
|
758
|
+
else {
|
|
759
|
+
const extracted = this.extractType(dependencyLoc, typesPath);
|
|
760
|
+
relativePath = extracted instanceof Error ? extracted : extracted.relativePath;
|
|
761
|
+
}
|
|
762
|
+
if (relativePath instanceof Error) {
|
|
763
|
+
return new Error((0, logging_1.format)('├─ Failed to extract type {yellow} due to an error in dependency type {yellow}\nfrom file {magenta} :\n{}', loc.typename, dependencyLoc.typename, relativeFilePath, relativePath.message.replace(/^/gm, ' ')));
|
|
764
|
+
}
|
|
765
|
+
// Update dependencies
|
|
766
|
+
dependencies.push({ ...dependencyLoc, relativePath });
|
|
767
|
+
}
|
|
768
|
+
const extracted = {
|
|
769
|
+
...loc,
|
|
770
|
+
relativePath: relativeFilePath,
|
|
771
|
+
typeParams,
|
|
772
|
+
content: extractedDecl,
|
|
773
|
+
dependencies,
|
|
774
|
+
};
|
|
775
|
+
typesPath.pop();
|
|
776
|
+
let types = this.extracted.get(relativeFilePath);
|
|
777
|
+
if (!types) {
|
|
778
|
+
types = new Map();
|
|
779
|
+
this.extracted.set(relativeFilePath, types);
|
|
780
|
+
}
|
|
781
|
+
// Save the dependency
|
|
782
|
+
types.set(loc.typename, extracted);
|
|
783
|
+
return extracted;
|
|
784
|
+
}
|
|
785
|
+
}
|
|
786
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"analyze.js","sourceRoot":"","sources":["../../src/engine/analyze.ts"],"names":[],"mappings":"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"}
|