@lenne.tech/cli 1.6.9 → 1.7.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/build/commands/completion.js +28 -1
- package/build/commands/config/validate.js +4 -1
- package/build/commands/fullstack/init.js +61 -12
- package/build/commands/server/create.js +59 -61
- package/build/commands/update.js +49 -2
- package/build/extensions/api-mode.js +440 -0
- package/build/extensions/server.js +38 -7
- package/build/templates/nest-server-starter/README.md.ejs +0 -1
- package/docs/lt.config.md +9 -2
- package/package.json +8 -8
package/build/commands/update.js
CHANGED
|
@@ -9,6 +9,24 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
9
9
|
});
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
+
const child_process_1 = require("child_process");
|
|
13
|
+
/**
|
|
14
|
+
* Get the version that a new CLI process would use by running 'lt --version'.
|
|
15
|
+
* This is the most reliable way to check if the update was successful,
|
|
16
|
+
* as it tests the actual behavior of a new process.
|
|
17
|
+
*/
|
|
18
|
+
function getNewProcessVersion() {
|
|
19
|
+
try {
|
|
20
|
+
const result = (0, child_process_1.execSync)('lt --version', {
|
|
21
|
+
encoding: 'utf-8',
|
|
22
|
+
stdio: ['pipe', 'pipe', 'pipe'],
|
|
23
|
+
});
|
|
24
|
+
return result.trim();
|
|
25
|
+
}
|
|
26
|
+
catch (_a) {
|
|
27
|
+
return null;
|
|
28
|
+
}
|
|
29
|
+
}
|
|
12
30
|
/**
|
|
13
31
|
* Update @lenne.tech/cli
|
|
14
32
|
*/
|
|
@@ -19,12 +37,41 @@ const NewCommand = {
|
|
|
19
37
|
name: 'update',
|
|
20
38
|
run: (toolbox) => __awaiter(void 0, void 0, void 0, function* () {
|
|
21
39
|
// Retrieve the tools we need
|
|
22
|
-
const { helper, runtime: { brand }, } = toolbox;
|
|
40
|
+
const { helper, meta, print: { info, warning }, runtime: { brand }, } = toolbox;
|
|
41
|
+
// Store version before update
|
|
42
|
+
const versionBefore = meta.version();
|
|
23
43
|
// Update cli and show process
|
|
24
44
|
yield helper.updateCli({ showInfos: true });
|
|
45
|
+
// Check what version a new process would use
|
|
46
|
+
const newProcessVersion = getNewProcessVersion();
|
|
47
|
+
// Check if update was successful and version changed
|
|
48
|
+
if (newProcessVersion && newProcessVersion !== versionBefore) {
|
|
49
|
+
info('');
|
|
50
|
+
info(`Update successful: ${versionBefore} → ${newProcessVersion}`);
|
|
51
|
+
info('');
|
|
52
|
+
const shell = process.env.SHELL || '';
|
|
53
|
+
if (shell.includes('zsh')) {
|
|
54
|
+
info(`To use the new version, run 'rehash' or open a new terminal.`);
|
|
55
|
+
}
|
|
56
|
+
else if (shell.includes('bash')) {
|
|
57
|
+
info(`To use the new version, run 'hash -r' or open a new terminal.`);
|
|
58
|
+
}
|
|
59
|
+
else {
|
|
60
|
+
info(`To use the new version, open a new terminal.`);
|
|
61
|
+
}
|
|
62
|
+
}
|
|
63
|
+
else if (newProcessVersion === versionBefore) {
|
|
64
|
+
info('');
|
|
65
|
+
info(`CLI is already up to date (${versionBefore}).`);
|
|
66
|
+
}
|
|
67
|
+
else {
|
|
68
|
+
// Could not verify update
|
|
69
|
+
warning('');
|
|
70
|
+
warning(`Could not verify update. Please run 'lt --version' to check.`);
|
|
71
|
+
}
|
|
25
72
|
// For tests
|
|
26
73
|
return `updated ${brand}`;
|
|
27
74
|
}),
|
|
28
75
|
};
|
|
29
76
|
exports.default = NewCommand;
|
|
30
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
77
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXBkYXRlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2NvbW1hbmRzL3VwZGF0ZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7OztBQUFBLGlEQUF5QztBQUt6Qzs7OztHQUlHO0FBQ0gsU0FBUyxvQkFBb0I7SUFDM0IsSUFBSSxDQUFDO1FBQ0gsTUFBTSxNQUFNLEdBQUcsSUFBQSx3QkFBUSxFQUFDLGNBQWMsRUFBRTtZQUN0QyxRQUFRLEVBQUUsT0FBTztZQUNqQixLQUFLLEVBQUUsQ0FBQyxNQUFNLEVBQUUsTUFBTSxFQUFFLE1BQU0sQ0FBQztTQUNoQyxDQUFDLENBQUM7UUFDSCxPQUFPLE1BQU0sQ0FBQyxJQUFJLEVBQUUsQ0FBQztJQUN2QixDQUFDO0lBQUMsV0FBTSxDQUFDO1FBQ1AsT0FBTyxJQUFJLENBQUM7SUFDZCxDQUFDO0FBQ0gsQ0FBQztBQUVEOztHQUVHO0FBQ0gsTUFBTSxVQUFVLEdBQW1CO0lBQ2pDLEtBQUssRUFBRSxDQUFDLElBQUksQ0FBQztJQUNiLFdBQVcsRUFBRSx3QkFBd0I7SUFDckMsTUFBTSxFQUFFLEtBQUs7SUFDYixJQUFJLEVBQUUsUUFBUTtJQUNkLEdBQUcsRUFBRSxDQUFPLE9BQStCLEVBQUUsRUFBRTtRQUM3Qyw2QkFBNkI7UUFDN0IsTUFBTSxFQUNKLE1BQU0sRUFDTixJQUFJLEVBQ0osS0FBSyxFQUFFLEVBQUUsSUFBSSxFQUFFLE9BQU8sRUFBRSxFQUN4QixPQUFPLEVBQUUsRUFBRSxLQUFLLEVBQUUsR0FDbkIsR0FBRyxPQUFPLENBQUM7UUFFWiw4QkFBOEI7UUFDOUIsTUFBTSxhQUFhLEdBQUcsSUFBSSxDQUFDLE9BQU8sRUFBRSxDQUFDO1FBRXJDLDhCQUE4QjtRQUM5QixNQUFNLE1BQU0sQ0FBQyxTQUFTLENBQUMsRUFBRSxTQUFTLEVBQUUsSUFBSSxFQUFFLENBQUMsQ0FBQztRQUU1Qyw2Q0FBNkM7UUFDN0MsTUFBTSxpQkFBaUIsR0FBRyxvQkFBb0IsRUFBRSxDQUFDO1FBRWpELHFEQUFxRDtRQUNyRCxJQUFJLGlCQUFpQixJQUFJLGlCQUFpQixLQUFLLGFBQWEsRUFBRSxDQUFDO1lBQzdELElBQUksQ0FBQyxFQUFFLENBQUMsQ0FBQztZQUNULElBQUksQ0FBQyxzQkFBc0IsYUFBYSxNQUFNLGlCQUFpQixFQUFFLENBQUMsQ0FBQztZQUNuRSxJQUFJLENBQUMsRUFBRSxDQUFDLENBQUM7WUFDVCxNQUFNLEtBQUssR0FBRyxPQUFPLENBQUMsR0FBRyxDQUFDLEtBQUssSUFBSSxFQUFFLENBQUM7WUFDdEMsSUFBSSxLQUFLLENBQUMsUUFBUSxDQUFDLEtBQUssQ0FBQyxFQUFFLENBQUM7Z0JBQzFCLElBQUksQ0FBQyw4REFBOEQsQ0FBQyxDQUFDO1lBQ3ZFLENBQUM7aUJBQU0sSUFBSSxLQUFLLENBQUMsUUFBUSxDQUFDLE1BQU0sQ0FBQyxFQUFFLENBQUM7Z0JBQ2xDLElBQUksQ0FBQywrREFBK0QsQ0FBQyxDQUFDO1lBQ3hFLENBQUM7aUJBQU0sQ0FBQztnQkFDTixJQUFJLENBQUMsOENBQThDLENBQUMsQ0FBQztZQUN2RCxDQUFDO1FBQ0gsQ0FBQzthQUFNLElBQUksaUJBQWlCLEtBQUssYUFBYSxFQUFFLENBQUM7WUFDL0MsSUFBSSxDQUFDLEVBQUUsQ0FBQyxDQUFDO1lBQ1QsSUFBSSxDQUFDLDhCQUE4QixhQUFhLElBQUksQ0FBQyxDQUFDO1FBQ3hELENBQUM7YUFBTSxDQUFDO1lBQ04sMEJBQTBCO1lBQzFCLE9BQU8sQ0FBQyxFQUFFLENBQUMsQ0FBQztZQUNaLE9BQU8sQ0FBQyw4REFBOEQsQ0FBQyxDQUFDO1FBQzFFLENBQUM7UUFFRCxZQUFZO1FBQ1osT0FBTyxXQUFXLEtBQUssRUFBRSxDQUFDO0lBQzVCLENBQUMsQ0FBQTtDQUNGLENBQUM7QUFFRixrQkFBZSxVQUFVLENBQUMifQ==
|
|
@@ -0,0 +1,440 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
+
});
|
|
10
|
+
};
|
|
11
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
+
exports.ApiMode = void 0;
|
|
13
|
+
const path_1 = require("path");
|
|
14
|
+
/**
|
|
15
|
+
* API Mode processing for nest-server-starter template
|
|
16
|
+
*
|
|
17
|
+
* Reads the api-mode.manifest.json from the project and processes it
|
|
18
|
+
* based on the selected API mode (Rest, GraphQL, Both).
|
|
19
|
+
*/
|
|
20
|
+
class ApiMode {
|
|
21
|
+
constructor(toolbox) {
|
|
22
|
+
this.toolbox = toolbox;
|
|
23
|
+
this.filesystem = toolbox.filesystem;
|
|
24
|
+
}
|
|
25
|
+
/**
|
|
26
|
+
* Process the API mode for a project
|
|
27
|
+
*
|
|
28
|
+
* @param projectPath - Path to the project root
|
|
29
|
+
* @param mode - Selected API mode
|
|
30
|
+
*/
|
|
31
|
+
processApiMode(projectPath, mode) {
|
|
32
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
33
|
+
const manifestPath = (0, path_1.join)(projectPath, 'api-mode.manifest.json');
|
|
34
|
+
// Read manifest
|
|
35
|
+
const manifestContent = this.filesystem.read(manifestPath);
|
|
36
|
+
if (!manifestContent) {
|
|
37
|
+
return; // No manifest = nothing to do
|
|
38
|
+
}
|
|
39
|
+
const manifest = JSON.parse(manifestContent);
|
|
40
|
+
if (mode === 'Both') {
|
|
41
|
+
// Both mode: just remove markers and cleanup
|
|
42
|
+
this.stripAllMarkers(projectPath);
|
|
43
|
+
}
|
|
44
|
+
else if (mode === 'Rest') {
|
|
45
|
+
// REST mode: remove graphql regions, keep rest regions
|
|
46
|
+
yield this.removeMode(projectPath, manifest, 'graphql', 'rest');
|
|
47
|
+
yield this.modifyConfigEnvForRest(projectPath);
|
|
48
|
+
}
|
|
49
|
+
else if (mode === 'GraphQL') {
|
|
50
|
+
// GraphQL mode: remove rest regions, keep graphql regions
|
|
51
|
+
yield this.removeMode(projectPath, manifest, 'rest', 'graphql');
|
|
52
|
+
}
|
|
53
|
+
// Remove manifest and strip-markers script
|
|
54
|
+
this.filesystem.remove(manifestPath);
|
|
55
|
+
this.filesystem.remove((0, path_1.join)(projectPath, 'scripts', 'strip-api-mode-markers.mjs'));
|
|
56
|
+
// Remove strip-markers script from package.json
|
|
57
|
+
this.removeScriptFromPackageJson(projectPath, 'strip-markers');
|
|
58
|
+
});
|
|
59
|
+
}
|
|
60
|
+
/**
|
|
61
|
+
* Remove a specific mode from the project
|
|
62
|
+
*/
|
|
63
|
+
removeMode(projectPath, manifest, removeMarker, keepMarker) {
|
|
64
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
65
|
+
var _a, _b, _c;
|
|
66
|
+
const modeConfig = manifest.modes[removeMarker];
|
|
67
|
+
if (!modeConfig) {
|
|
68
|
+
return;
|
|
69
|
+
}
|
|
70
|
+
// 1. Delete files matching filePatterns
|
|
71
|
+
if (modeConfig.filePatterns) {
|
|
72
|
+
for (const pattern of modeConfig.filePatterns) {
|
|
73
|
+
const matches = this.filesystem.find(projectPath, {
|
|
74
|
+
matching: pattern,
|
|
75
|
+
});
|
|
76
|
+
for (const file of matches) {
|
|
77
|
+
this.filesystem.remove(file);
|
|
78
|
+
}
|
|
79
|
+
}
|
|
80
|
+
}
|
|
81
|
+
// 2. Remove packages from package.json
|
|
82
|
+
const pkgPath = (0, path_1.join)(projectPath, 'package.json');
|
|
83
|
+
const pkg = JSON.parse(this.filesystem.read(pkgPath));
|
|
84
|
+
if (modeConfig.packages) {
|
|
85
|
+
for (const p of modeConfig.packages) {
|
|
86
|
+
(_a = pkg.dependencies) === null || _a === void 0 ? true : delete _a[p];
|
|
87
|
+
}
|
|
88
|
+
}
|
|
89
|
+
if (modeConfig.devPackages) {
|
|
90
|
+
for (const p of modeConfig.devPackages) {
|
|
91
|
+
(_b = pkg.devDependencies) === null || _b === void 0 ? true : delete _b[p];
|
|
92
|
+
}
|
|
93
|
+
}
|
|
94
|
+
// 3. Remove scripts
|
|
95
|
+
if (modeConfig.scripts) {
|
|
96
|
+
for (const s of modeConfig.scripts) {
|
|
97
|
+
(_c = pkg.scripts) === null || _c === void 0 ? true : delete _c[s];
|
|
98
|
+
}
|
|
99
|
+
}
|
|
100
|
+
// 4. Edit scripts (e.g. remove parts from a script value)
|
|
101
|
+
if (modeConfig.scriptEdits && pkg.scripts) {
|
|
102
|
+
for (const [scriptName, edit] of Object.entries(modeConfig.scriptEdits)) {
|
|
103
|
+
if (pkg.scripts[scriptName] && edit.remove) {
|
|
104
|
+
pkg.scripts[scriptName] = pkg.scripts[scriptName].replace(edit.remove, '');
|
|
105
|
+
}
|
|
106
|
+
}
|
|
107
|
+
}
|
|
108
|
+
this.filesystem.write(pkgPath, pkg, { jsonIndent: 2 });
|
|
109
|
+
// 5. Strip regions from source files
|
|
110
|
+
this.stripRegions(projectPath, removeMarker, keepMarker);
|
|
111
|
+
// 6. Clean orphan imports
|
|
112
|
+
this.cleanOrphanImports(projectPath);
|
|
113
|
+
});
|
|
114
|
+
}
|
|
115
|
+
/**
|
|
116
|
+
* Strip region markers from all .ts files
|
|
117
|
+
*
|
|
118
|
+
* For removeMarker: delete marker lines AND content between them
|
|
119
|
+
* For keepMarker: delete only the marker lines, keep content
|
|
120
|
+
*/
|
|
121
|
+
stripRegions(projectPath, removeMarker, keepMarker) {
|
|
122
|
+
const dirs = [(0, path_1.join)(projectPath, 'src'), (0, path_1.join)(projectPath, 'tests')];
|
|
123
|
+
for (const dir of dirs) {
|
|
124
|
+
if (!this.filesystem.exists(dir)) {
|
|
125
|
+
continue;
|
|
126
|
+
}
|
|
127
|
+
const files = this.filesystem.find(dir, { matching: '**/*.ts' });
|
|
128
|
+
for (const file of files) {
|
|
129
|
+
const content = this.filesystem.read(file);
|
|
130
|
+
if (!content) {
|
|
131
|
+
continue;
|
|
132
|
+
}
|
|
133
|
+
const processed = this.processFileRegions(content, removeMarker, keepMarker);
|
|
134
|
+
if (processed !== content) {
|
|
135
|
+
this.filesystem.write(file, processed);
|
|
136
|
+
}
|
|
137
|
+
}
|
|
138
|
+
}
|
|
139
|
+
}
|
|
140
|
+
/**
|
|
141
|
+
* Process region markers in file content
|
|
142
|
+
*/
|
|
143
|
+
processFileRegions(content, removeMarker, keepMarker) {
|
|
144
|
+
const lines = content.split('\n');
|
|
145
|
+
const result = [];
|
|
146
|
+
let removing = false;
|
|
147
|
+
for (const line of lines) {
|
|
148
|
+
const trimmed = line.trim();
|
|
149
|
+
// Check for region start
|
|
150
|
+
if (trimmed === `// #region ${removeMarker}`) {
|
|
151
|
+
removing = true;
|
|
152
|
+
continue; // Skip the marker line
|
|
153
|
+
}
|
|
154
|
+
// Check for region end
|
|
155
|
+
if (trimmed === `// #endregion ${removeMarker}`) {
|
|
156
|
+
removing = false;
|
|
157
|
+
continue; // Skip the marker line
|
|
158
|
+
}
|
|
159
|
+
// Check for keep markers (just remove the marker lines, keep content)
|
|
160
|
+
if (trimmed === `// #region ${keepMarker}` || trimmed === `// #endregion ${keepMarker}`) {
|
|
161
|
+
continue; // Skip marker line, content between them is kept naturally
|
|
162
|
+
}
|
|
163
|
+
// Skip content inside remove region
|
|
164
|
+
if (removing) {
|
|
165
|
+
continue;
|
|
166
|
+
}
|
|
167
|
+
result.push(line);
|
|
168
|
+
}
|
|
169
|
+
// Clean up multiple consecutive blank lines (max 1)
|
|
170
|
+
return this.collapseBlankLines(result.join('\n'));
|
|
171
|
+
}
|
|
172
|
+
/**
|
|
173
|
+
* Strip ALL markers (for Both mode) - keep all content
|
|
174
|
+
*/
|
|
175
|
+
stripAllMarkers(projectPath) {
|
|
176
|
+
const dirs = [(0, path_1.join)(projectPath, 'src'), (0, path_1.join)(projectPath, 'tests')];
|
|
177
|
+
for (const dir of dirs) {
|
|
178
|
+
if (!this.filesystem.exists(dir)) {
|
|
179
|
+
continue;
|
|
180
|
+
}
|
|
181
|
+
const files = this.filesystem.find(dir, { matching: '**/*.ts' });
|
|
182
|
+
for (const file of files) {
|
|
183
|
+
const content = this.filesystem.read(file);
|
|
184
|
+
if (!content) {
|
|
185
|
+
continue;
|
|
186
|
+
}
|
|
187
|
+
const lines = content.split('\n');
|
|
188
|
+
const filtered = lines.filter((line) => {
|
|
189
|
+
const trimmed = line.trim();
|
|
190
|
+
return !trimmed.match(/^\/\/ #(region|endregion)\s/);
|
|
191
|
+
});
|
|
192
|
+
const processed = filtered.join('\n');
|
|
193
|
+
if (processed !== content) {
|
|
194
|
+
this.filesystem.write(file, processed);
|
|
195
|
+
}
|
|
196
|
+
}
|
|
197
|
+
}
|
|
198
|
+
}
|
|
199
|
+
/**
|
|
200
|
+
* Modify config.env.ts for REST mode using ts-morph AST manipulation
|
|
201
|
+
*
|
|
202
|
+
* - Replace `graphQl: { ... }` blocks with `graphQl: false`
|
|
203
|
+
* - Remove `execAfterInit` properties
|
|
204
|
+
*/
|
|
205
|
+
modifyConfigEnvForRest(projectPath) {
|
|
206
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
207
|
+
var _a;
|
|
208
|
+
const configPath = (0, path_1.join)(projectPath, 'src', 'config.env.ts');
|
|
209
|
+
if (!this.filesystem.exists(configPath)) {
|
|
210
|
+
return;
|
|
211
|
+
}
|
|
212
|
+
try {
|
|
213
|
+
const { Project, SyntaxKind } = require('ts-morph');
|
|
214
|
+
const project = new Project({ skipAddingFilesFromTsConfig: true });
|
|
215
|
+
const sourceFile = project.addSourceFileAtPath(configPath);
|
|
216
|
+
// Find the 'config' variable declaration directly
|
|
217
|
+
// Structure: export const config: { [env: string]: ... } = { ci: { ... }, develop: { ... }, ... };
|
|
218
|
+
let configObj;
|
|
219
|
+
const variableStatements = sourceFile.getVariableStatements();
|
|
220
|
+
for (const vs of variableStatements) {
|
|
221
|
+
for (const decl of vs.getDeclarations()) {
|
|
222
|
+
if (decl.getName() === 'config') {
|
|
223
|
+
const init = decl.getInitializer();
|
|
224
|
+
if ((init === null || init === void 0 ? void 0 : init.getKind()) === SyntaxKind.ObjectLiteralExpression) {
|
|
225
|
+
configObj = init;
|
|
226
|
+
}
|
|
227
|
+
}
|
|
228
|
+
// Handle merge() call: const config = merge({ default: ... }, { local: ... }, ...)
|
|
229
|
+
if (!configObj) {
|
|
230
|
+
const init = decl.getInitializer();
|
|
231
|
+
if ((init === null || init === void 0 ? void 0 : init.getKind()) === SyntaxKind.CallExpression) {
|
|
232
|
+
const args = (_a = init.getArguments) === null || _a === void 0 ? void 0 : _a.call(init);
|
|
233
|
+
if (args) {
|
|
234
|
+
for (const arg of args) {
|
|
235
|
+
if (arg.getKind() === SyntaxKind.ObjectLiteralExpression) {
|
|
236
|
+
this.processConfigObject(arg, SyntaxKind);
|
|
237
|
+
}
|
|
238
|
+
}
|
|
239
|
+
}
|
|
240
|
+
}
|
|
241
|
+
}
|
|
242
|
+
}
|
|
243
|
+
}
|
|
244
|
+
if (configObj) {
|
|
245
|
+
this.processConfigObject(configObj, SyntaxKind);
|
|
246
|
+
}
|
|
247
|
+
sourceFile.saveSync();
|
|
248
|
+
}
|
|
249
|
+
catch (_b) {
|
|
250
|
+
// If ts-morph is not available or fails, fall back to regex
|
|
251
|
+
this.modifyConfigEnvForRestFallback(projectPath);
|
|
252
|
+
}
|
|
253
|
+
});
|
|
254
|
+
}
|
|
255
|
+
/**
|
|
256
|
+
* Process a config object literal: replace graphQl and remove execAfterInit
|
|
257
|
+
*/
|
|
258
|
+
processConfigObject(obj, SyntaxKind) {
|
|
259
|
+
// Process all nested object literals (environment configs)
|
|
260
|
+
const properties = obj.getProperties();
|
|
261
|
+
for (const prop of properties) {
|
|
262
|
+
if (prop.getKind() !== SyntaxKind.PropertyAssignment) {
|
|
263
|
+
continue;
|
|
264
|
+
}
|
|
265
|
+
const name = prop.getName();
|
|
266
|
+
// Replace graphQl: { ... } with graphQl: false
|
|
267
|
+
if (name === 'graphQl') {
|
|
268
|
+
const init = prop.getInitializer();
|
|
269
|
+
if (init && init.getKind() === SyntaxKind.ObjectLiteralExpression) {
|
|
270
|
+
prop.setInitializer('false');
|
|
271
|
+
}
|
|
272
|
+
continue;
|
|
273
|
+
}
|
|
274
|
+
// Remove execAfterInit
|
|
275
|
+
if (name === 'execAfterInit') {
|
|
276
|
+
prop.remove();
|
|
277
|
+
continue;
|
|
278
|
+
}
|
|
279
|
+
// Recurse into nested objects (environment configs like default, local, etc.)
|
|
280
|
+
const init = prop.getInitializer();
|
|
281
|
+
if ((init === null || init === void 0 ? void 0 : init.getKind()) === SyntaxKind.ObjectLiteralExpression) {
|
|
282
|
+
this.processConfigObject(init, SyntaxKind);
|
|
283
|
+
}
|
|
284
|
+
}
|
|
285
|
+
}
|
|
286
|
+
/**
|
|
287
|
+
* Fallback: Regex-based config.env.ts modification
|
|
288
|
+
*/
|
|
289
|
+
modifyConfigEnvForRestFallback(projectPath) {
|
|
290
|
+
const configPath = (0, path_1.join)(projectPath, 'src', 'config.env.ts');
|
|
291
|
+
let content = this.filesystem.read(configPath);
|
|
292
|
+
if (!content) {
|
|
293
|
+
return;
|
|
294
|
+
}
|
|
295
|
+
// Replace graphQl: { ... } blocks with graphQl: false
|
|
296
|
+
// Match graphQl: { ... }, handling nested braces
|
|
297
|
+
content = content.replace(/graphQl:\s*\{[^{}]*(?:\{[^{}]*\}[^{}]*)*\},?/g, 'graphQl: false,');
|
|
298
|
+
// Remove execAfterInit lines
|
|
299
|
+
content = content.replace(/\s*execAfterInit:.*,?\n/g, '\n');
|
|
300
|
+
this.filesystem.write(configPath, content);
|
|
301
|
+
}
|
|
302
|
+
/**
|
|
303
|
+
* Clean orphan imports after region stripping
|
|
304
|
+
*
|
|
305
|
+
* After removing region content, some imports may reference identifiers
|
|
306
|
+
* that no longer exist in the file. This removes those imports.
|
|
307
|
+
*/
|
|
308
|
+
cleanOrphanImports(projectPath) {
|
|
309
|
+
const dirs = [(0, path_1.join)(projectPath, 'src')];
|
|
310
|
+
for (const dir of dirs) {
|
|
311
|
+
if (!this.filesystem.exists(dir)) {
|
|
312
|
+
continue;
|
|
313
|
+
}
|
|
314
|
+
const files = this.filesystem.find(dir, { matching: '**/*.ts' });
|
|
315
|
+
for (const file of files) {
|
|
316
|
+
const content = this.filesystem.read(file);
|
|
317
|
+
if (!content) {
|
|
318
|
+
continue;
|
|
319
|
+
}
|
|
320
|
+
const cleaned = this.removeUnusedImports(content);
|
|
321
|
+
if (cleaned !== content) {
|
|
322
|
+
this.filesystem.write(file, cleaned);
|
|
323
|
+
}
|
|
324
|
+
}
|
|
325
|
+
}
|
|
326
|
+
}
|
|
327
|
+
/**
|
|
328
|
+
* Remove unused imports from TypeScript file content
|
|
329
|
+
*/
|
|
330
|
+
removeUnusedImports(content) {
|
|
331
|
+
const lines = content.split('\n');
|
|
332
|
+
const importLines = [];
|
|
333
|
+
// Parse import statements
|
|
334
|
+
let i = 0;
|
|
335
|
+
while (i < lines.length) {
|
|
336
|
+
const line = lines[i];
|
|
337
|
+
const singleImportMatch = line.match(/^import\s+\{([^}]+)\}\s+from\s+['"]/);
|
|
338
|
+
const multiImportStart = line.match(/^import\s+\{$/);
|
|
339
|
+
if (singleImportMatch) {
|
|
340
|
+
const imports = singleImportMatch[1].split(',')
|
|
341
|
+
.map((s) => s.trim())
|
|
342
|
+
.filter(Boolean)
|
|
343
|
+
.map((s) => ({ original: s, resolved: this.resolveImportAlias(s) }));
|
|
344
|
+
importLines.push({ end: i, imports, start: i });
|
|
345
|
+
}
|
|
346
|
+
else if (multiImportStart) {
|
|
347
|
+
// Multi-line import
|
|
348
|
+
const start = i;
|
|
349
|
+
const imports = [];
|
|
350
|
+
i++;
|
|
351
|
+
while (i < lines.length && !lines[i].match(/^\}\s+from\s+['"]/)) {
|
|
352
|
+
const raw = lines[i].replace(/,?\s*$/, '').trim();
|
|
353
|
+
if (raw) {
|
|
354
|
+
imports.push({ original: raw, resolved: this.resolveImportAlias(raw) });
|
|
355
|
+
}
|
|
356
|
+
i++;
|
|
357
|
+
}
|
|
358
|
+
importLines.push({ end: i, imports, start });
|
|
359
|
+
}
|
|
360
|
+
i++;
|
|
361
|
+
}
|
|
362
|
+
// Get the non-import part of the file
|
|
363
|
+
const maxImportEnd = importLines.reduce((max, il) => Math.max(max, il.end), -1);
|
|
364
|
+
const codeContent = lines.slice(maxImportEnd + 1).join('\n');
|
|
365
|
+
// Check each import
|
|
366
|
+
const linesToRemove = new Set();
|
|
367
|
+
for (const imp of importLines) {
|
|
368
|
+
const usedImports = imp.imports.filter(({ resolved }) => {
|
|
369
|
+
// Check if resolved identifier is used in code (not in imports)
|
|
370
|
+
const regex = new RegExp(`\\b${resolved.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')}\\b`);
|
|
371
|
+
return regex.test(codeContent);
|
|
372
|
+
});
|
|
373
|
+
if (usedImports.length === 0) {
|
|
374
|
+
// Remove entire import
|
|
375
|
+
for (let j = imp.start; j <= imp.end; j++) {
|
|
376
|
+
linesToRemove.add(j);
|
|
377
|
+
}
|
|
378
|
+
}
|
|
379
|
+
else if (usedImports.length < imp.imports.length) {
|
|
380
|
+
// Rebuild import with only used identifiers (using original text for aliases)
|
|
381
|
+
const fromMatch = lines[imp.end].match(/from\s+['"].*['"]/);
|
|
382
|
+
const fromClause = fromMatch ? fromMatch[0] : '';
|
|
383
|
+
if (fromClause) {
|
|
384
|
+
// Remove old lines
|
|
385
|
+
for (let j = imp.start; j <= imp.end; j++) {
|
|
386
|
+
linesToRemove.add(j);
|
|
387
|
+
}
|
|
388
|
+
const originals = usedImports.map((ui) => ui.original);
|
|
389
|
+
// Add rebuilt import at start position
|
|
390
|
+
if (originals.length <= 3) {
|
|
391
|
+
lines[imp.start] = `import { ${originals.join(', ')} } ${fromClause};`;
|
|
392
|
+
linesToRemove.delete(imp.start);
|
|
393
|
+
}
|
|
394
|
+
else {
|
|
395
|
+
// Multi-line for many imports
|
|
396
|
+
lines[imp.start] = `import {\n ${originals.join(',\n ')},\n} ${fromClause};`;
|
|
397
|
+
linesToRemove.delete(imp.start);
|
|
398
|
+
}
|
|
399
|
+
}
|
|
400
|
+
}
|
|
401
|
+
}
|
|
402
|
+
// Remove marked lines
|
|
403
|
+
const result = lines.filter((_, idx) => !linesToRemove.has(idx));
|
|
404
|
+
return this.collapseBlankLines(result.join('\n'));
|
|
405
|
+
}
|
|
406
|
+
/**
|
|
407
|
+
* Resolve import alias: "Schema as MongooseSchema" -> "MongooseSchema"
|
|
408
|
+
* For non-aliased imports, returns the identifier as-is.
|
|
409
|
+
*/
|
|
410
|
+
resolveImportAlias(identifier) {
|
|
411
|
+
const asMatch = identifier.match(/^\S+\s+as\s+(\S+)$/);
|
|
412
|
+
return asMatch ? asMatch[1] : identifier;
|
|
413
|
+
}
|
|
414
|
+
/**
|
|
415
|
+
* Collapse multiple consecutive blank lines into at most one
|
|
416
|
+
*/
|
|
417
|
+
collapseBlankLines(content) {
|
|
418
|
+
return content.replace(/\n{3,}/g, '\n\n');
|
|
419
|
+
}
|
|
420
|
+
/**
|
|
421
|
+
* Remove a script from package.json
|
|
422
|
+
*/
|
|
423
|
+
removeScriptFromPackageJson(projectPath, scriptName) {
|
|
424
|
+
var _a;
|
|
425
|
+
const pkgPath = (0, path_1.join)(projectPath, 'package.json');
|
|
426
|
+
const pkg = JSON.parse(this.filesystem.read(pkgPath));
|
|
427
|
+
if ((_a = pkg.scripts) === null || _a === void 0 ? void 0 : _a[scriptName]) {
|
|
428
|
+
delete pkg.scripts[scriptName];
|
|
429
|
+
this.filesystem.write(pkgPath, pkg, { jsonIndent: 2 });
|
|
430
|
+
}
|
|
431
|
+
}
|
|
432
|
+
}
|
|
433
|
+
exports.ApiMode = ApiMode;
|
|
434
|
+
/**
|
|
435
|
+
* Extend toolbox
|
|
436
|
+
*/
|
|
437
|
+
exports.default = (toolbox) => {
|
|
438
|
+
toolbox.apiMode = new ApiMode(toolbox);
|
|
439
|
+
};
|
|
440
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"api-mode.js","sourceRoot":"","sources":["../../src/extensions/api-mode.ts"],"names":[],"mappings":"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"}
|