@lenne.tech/cli 0.0.125 → 1.0.1
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/bin/lt +145 -14
- package/build/commands/claude/install-commands.js +332 -0
- package/build/commands/claude/install-skills.js +626 -0
- package/build/commands/config/config.js +25 -0
- package/build/commands/config/help.js +167 -0
- package/build/commands/config/init.js +143 -0
- package/build/commands/config/show.js +68 -0
- package/build/commands/server/add-property.js +163 -46
- package/build/commands/server/create.js +66 -4
- package/build/commands/server/module.js +133 -20
- package/build/commands/server/object.js +23 -15
- package/build/extensions/config.js +157 -0
- package/build/extensions/server.js +194 -63
- package/build/interfaces/lt-config.interface.js +3 -0
- package/build/templates/claude-commands/code-cleanup.md +82 -0
- package/build/templates/claude-commands/mr-description-clipboard.md +48 -0
- package/build/templates/claude-commands/mr-description.md +33 -0
- package/build/templates/claude-commands/sec-review.md +62 -0
- package/build/templates/claude-commands/skill-optimize.md +140 -0
- package/build/templates/claude-commands/test-generate.md +45 -0
- package/build/templates/claude-skills/lt-cli/SKILL.md +190 -259
- package/build/templates/claude-skills/lt-cli/examples.md +433 -203
- package/build/templates/claude-skills/lt-cli/reference.md +400 -226
- package/build/templates/claude-skills/nest-server-generator/SKILL.md +1891 -0
- package/build/templates/claude-skills/nest-server-generator/configuration.md +279 -0
- package/build/templates/claude-skills/nest-server-generator/declare-keyword-warning.md +124 -0
- package/build/templates/claude-skills/nest-server-generator/description-management.md +217 -0
- package/build/templates/claude-skills/nest-server-generator/examples.md +886 -0
- package/build/templates/claude-skills/nest-server-generator/quality-review.md +855 -0
- package/build/templates/claude-skills/nest-server-generator/reference.md +471 -0
- package/build/templates/claude-skills/nest-server-generator/security-rules.md +358 -0
- package/build/templates/claude-skills/story-tdd/SKILL.md +1173 -0
- package/build/templates/claude-skills/story-tdd/code-quality.md +266 -0
- package/build/templates/claude-skills/story-tdd/database-indexes.md +173 -0
- package/build/templates/claude-skills/story-tdd/examples.md +1332 -0
- package/build/templates/claude-skills/story-tdd/reference.md +1180 -0
- package/build/templates/claude-skills/story-tdd/security-review.md +299 -0
- package/build/templates/nest-server-module/inputs/template-create.input.ts.ejs +1 -3
- package/build/templates/nest-server-module/inputs/template.input.ts.ejs +1 -1
- package/build/templates/nest-server-module/template.controller.ts.ejs +24 -13
- package/build/templates/nest-server-module/template.model.ts.ejs +2 -2
- package/build/templates/nest-server-module/template.module.ts.ejs +4 -0
- package/build/templates/nest-server-module/template.service.ts.ejs +6 -6
- package/build/templates/nest-server-object/template.object.ts.ejs +2 -2
- package/package.json +13 -11
- package/build/commands/claude/install-skill.js +0 -93
|
@@ -11,20 +11,73 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
const path_1 = require("path");
|
|
13
13
|
const object_1 = require("./object");
|
|
14
|
+
/**
|
|
15
|
+
* Detect controller type based on existing modules
|
|
16
|
+
* Analyzes project modules (excluding base modules) to determine common pattern
|
|
17
|
+
*/
|
|
18
|
+
function detectControllerType(filesystem, path) {
|
|
19
|
+
const modulesDir = (0, path_1.join)(path, 'src', 'server', 'modules');
|
|
20
|
+
// Check if modules directory exists
|
|
21
|
+
if (!filesystem.exists(modulesDir)) {
|
|
22
|
+
return 'Both'; // Default if no modules exist yet
|
|
23
|
+
}
|
|
24
|
+
// Base modules to exclude from analysis
|
|
25
|
+
const excludeModules = ['auth', 'file', 'meta', 'user'];
|
|
26
|
+
// Get all module directories
|
|
27
|
+
const allModules = filesystem.list(modulesDir) || [];
|
|
28
|
+
const modulesToAnalyze = allModules.filter((module) => !excludeModules.includes(module) && filesystem.isDirectory((0, path_1.join)(modulesDir, module)));
|
|
29
|
+
// If no modules to analyze, use default
|
|
30
|
+
if (modulesToAnalyze.length === 0) {
|
|
31
|
+
return 'Both';
|
|
32
|
+
}
|
|
33
|
+
// Count patterns
|
|
34
|
+
let onlyController = 0;
|
|
35
|
+
let onlyResolver = 0;
|
|
36
|
+
let both = 0;
|
|
37
|
+
for (const module of modulesToAnalyze) {
|
|
38
|
+
const moduleDir = (0, path_1.join)(modulesDir, module);
|
|
39
|
+
const hasController = filesystem.exists((0, path_1.join)(moduleDir, `${module}.controller.ts`));
|
|
40
|
+
const hasResolver = filesystem.exists((0, path_1.join)(moduleDir, `${module}.resolver.ts`));
|
|
41
|
+
if (hasController && hasResolver) {
|
|
42
|
+
both++;
|
|
43
|
+
}
|
|
44
|
+
else if (hasController && !hasResolver) {
|
|
45
|
+
onlyController++;
|
|
46
|
+
}
|
|
47
|
+
else if (!hasController && hasResolver) {
|
|
48
|
+
onlyResolver++;
|
|
49
|
+
}
|
|
50
|
+
// If neither exists, skip (incomplete module)
|
|
51
|
+
}
|
|
52
|
+
// Decision logic
|
|
53
|
+
// If we have clear majority pattern, use it
|
|
54
|
+
if (both > 0) {
|
|
55
|
+
return 'Both'; // If any module uses both, prefer both
|
|
56
|
+
}
|
|
57
|
+
else if (onlyController > 0 && onlyResolver === 0) {
|
|
58
|
+
return 'Rest'; // Only REST controllers found
|
|
59
|
+
}
|
|
60
|
+
else if (onlyResolver > 0 && onlyController === 0) {
|
|
61
|
+
return 'GraphQL'; // Only GraphQL resolvers found
|
|
62
|
+
}
|
|
63
|
+
// Default to Both if mixed or unclear
|
|
64
|
+
return 'Both';
|
|
65
|
+
}
|
|
14
66
|
/**
|
|
15
67
|
* Create a new server module
|
|
16
68
|
*/
|
|
17
69
|
const NewCommand = {
|
|
18
70
|
alias: ['m'],
|
|
19
|
-
description: 'Creates a new server module. Use --name <ModuleName>, --controller (Rest|GraphQL|Both), and property flags --prop-name-X, --prop-type-X, etc. for non-interactive mode.',
|
|
71
|
+
description: 'Creates a new server module. Use --name <ModuleName>, --controller (Rest|GraphQL|Both|auto), and property flags --prop-name-X, --prop-type-X, etc. for non-interactive mode. Use "auto" to auto-detect controller type from existing modules.',
|
|
20
72
|
hidden: false,
|
|
21
73
|
name: 'module',
|
|
22
74
|
run: (toolbox, options) => __awaiter(void 0, void 0, void 0, function* () {
|
|
75
|
+
var _a, _b, _c, _d, _e, _f;
|
|
23
76
|
// Options:
|
|
24
77
|
const { currentItem, preventExitProcess } = Object.assign({ currentItem: '', preventExitProcess: false }, options);
|
|
25
78
|
let { objectsToAdd = [], referencesToAdd = [] } = options || {};
|
|
26
79
|
// Retrieve the tools we need
|
|
27
|
-
const { filesystem, helper, parameters, patching, print: { divider, error, info, spin, success }, prompt: { ask, confirm }, server, strings: { camelCase, kebabCase, pascalCase }, system, template, } = toolbox;
|
|
80
|
+
const { config, filesystem, helper, parameters, patching, print: { divider, error, info, spin, success }, prompt: { ask, confirm }, server, strings: { camelCase, kebabCase, pascalCase }, system, template, } = toolbox;
|
|
28
81
|
// Start timer
|
|
29
82
|
const timer = system.startTimer();
|
|
30
83
|
// Info
|
|
@@ -34,6 +87,10 @@ const NewCommand = {
|
|
|
34
87
|
else {
|
|
35
88
|
info('Create a new server module');
|
|
36
89
|
}
|
|
90
|
+
// Load configuration
|
|
91
|
+
const ltConfig = config.loadConfig();
|
|
92
|
+
const configController = (_c = (_b = (_a = ltConfig === null || ltConfig === void 0 ? void 0 : ltConfig.commands) === null || _a === void 0 ? void 0 : _a.server) === null || _b === void 0 ? void 0 : _b.module) === null || _c === void 0 ? void 0 : _c.controller;
|
|
93
|
+
const configSkipLint = (_f = (_e = (_d = ltConfig === null || ltConfig === void 0 ? void 0 : ltConfig.commands) === null || _d === void 0 ? void 0 : _d.server) === null || _e === void 0 ? void 0 : _e.module) === null || _f === void 0 ? void 0 : _f.skipLint;
|
|
37
94
|
// Parse CLI arguments
|
|
38
95
|
const { controller: cliController, name: cliName, skipLint: cliSkipLint } = parameters.options;
|
|
39
96
|
let name = cliName || currentItem || parameters.first;
|
|
@@ -46,16 +103,6 @@ const NewCommand = {
|
|
|
46
103
|
if (!name) {
|
|
47
104
|
return;
|
|
48
105
|
}
|
|
49
|
-
const controller = cliController || (yield ask({
|
|
50
|
-
choices: ['Rest', 'GraphQL', 'Both'],
|
|
51
|
-
message: 'What controller type?',
|
|
52
|
-
name: 'controller',
|
|
53
|
-
type: 'select',
|
|
54
|
-
})).controller;
|
|
55
|
-
// Set up initial props (to pass into templates)
|
|
56
|
-
const nameCamel = camelCase(name);
|
|
57
|
-
const nameKebab = kebabCase(name);
|
|
58
|
-
const namePascal = pascalCase(name);
|
|
59
106
|
// Check if directory
|
|
60
107
|
const cwd = filesystem.cwd();
|
|
61
108
|
const path = cwd.substr(0, cwd.lastIndexOf('src'));
|
|
@@ -64,6 +111,52 @@ const NewCommand = {
|
|
|
64
111
|
error(`No src directory in "${path}".`);
|
|
65
112
|
return undefined;
|
|
66
113
|
}
|
|
114
|
+
// Determine controller type with priority: CLI > config > auto-detect > interactive
|
|
115
|
+
let controller;
|
|
116
|
+
const detected = detectControllerType(filesystem, path);
|
|
117
|
+
// Priority 1: CLI parameter
|
|
118
|
+
if (cliController) {
|
|
119
|
+
if (cliController.toLowerCase() === 'auto') {
|
|
120
|
+
// Auto-detect without interactive prompt
|
|
121
|
+
info(`Auto-detected controller pattern: ${detected} (based on existing modules)`);
|
|
122
|
+
controller = detected;
|
|
123
|
+
}
|
|
124
|
+
else {
|
|
125
|
+
// Explicit controller type provided via CLI
|
|
126
|
+
controller = cliController;
|
|
127
|
+
}
|
|
128
|
+
}
|
|
129
|
+
// Priority 2: Config file
|
|
130
|
+
else if (configController) {
|
|
131
|
+
if (configController.toLowerCase() === 'auto') {
|
|
132
|
+
// Auto-detect from config
|
|
133
|
+
info(`Auto-detected controller pattern: ${detected} (based on existing modules, configured via lt.config.json)`);
|
|
134
|
+
controller = detected;
|
|
135
|
+
}
|
|
136
|
+
else {
|
|
137
|
+
// Use config value
|
|
138
|
+
info(`Using controller type from lt.config.json: ${configController}`);
|
|
139
|
+
controller = configController;
|
|
140
|
+
}
|
|
141
|
+
}
|
|
142
|
+
// Priority 3: Interactive mode with auto-detection
|
|
143
|
+
else {
|
|
144
|
+
// Map detected value to index for initial selection
|
|
145
|
+
const choices = ['Rest', 'GraphQL', 'Both'];
|
|
146
|
+
const initialIndex = choices.indexOf(detected);
|
|
147
|
+
info(`Detected controller pattern: ${detected} (based on existing modules)`);
|
|
148
|
+
controller = (yield ask([{
|
|
149
|
+
choices,
|
|
150
|
+
initial: initialIndex >= 0 ? initialIndex : 2, // Default to 'Both' (index 2)
|
|
151
|
+
message: 'What controller type?',
|
|
152
|
+
name: 'controller',
|
|
153
|
+
type: 'select',
|
|
154
|
+
}])).controller || detected;
|
|
155
|
+
}
|
|
156
|
+
// Set up initial props (to pass into templates)
|
|
157
|
+
const nameCamel = camelCase(name);
|
|
158
|
+
const nameKebab = kebabCase(name);
|
|
159
|
+
const namePascal = pascalCase(name);
|
|
67
160
|
const directory = (0, path_1.join)(path, 'src', 'server', 'modules', nameKebab);
|
|
68
161
|
if (filesystem.exists(directory)) {
|
|
69
162
|
info('');
|
|
@@ -74,10 +167,9 @@ const NewCommand = {
|
|
|
74
167
|
objectsToAdd = newObjects;
|
|
75
168
|
referencesToAdd = newReferences;
|
|
76
169
|
const generateSpinner = spin('Generate files');
|
|
77
|
-
const
|
|
78
|
-
const
|
|
79
|
-
const
|
|
80
|
-
const modelTemplate = server.propsForModel(props, { declare, modelName: name });
|
|
170
|
+
const inputTemplate = server.propsForInput(props, { modelName: name, nullable: true });
|
|
171
|
+
const createTemplate = server.propsForInput(props, { create: true, modelName: name, nullable: false });
|
|
172
|
+
const modelTemplate = server.propsForModel(props, { modelName: name });
|
|
81
173
|
// nest-server-module/inputs/xxx.input.ts
|
|
82
174
|
yield template.generate({
|
|
83
175
|
props: { imports: inputTemplate.imports, nameCamel, nameKebab, namePascal, props: inputTemplate.props },
|
|
@@ -133,7 +225,7 @@ const NewCommand = {
|
|
|
133
225
|
}
|
|
134
226
|
// nest-server-module/xxx.service.ts
|
|
135
227
|
yield template.generate({
|
|
136
|
-
props: { nameCamel, nameKebab, namePascal },
|
|
228
|
+
props: { isGql: controller === 'GraphQL' || controller === 'Both', nameCamel, nameKebab, namePascal },
|
|
137
229
|
target: (0, path_1.join)(directory, `${nameKebab}.service.ts`),
|
|
138
230
|
template: 'nest-server-module/template.service.ts.ejs',
|
|
139
231
|
});
|
|
@@ -157,6 +249,22 @@ const NewCommand = {
|
|
|
157
249
|
after: new RegExp('imports = \\[[^\\]]*', 'm'),
|
|
158
250
|
insert: ` forwardRef(() => ${namePascal}Module),\n `,
|
|
159
251
|
});
|
|
252
|
+
// Ensure forwardRef is imported from @nestjs/common
|
|
253
|
+
const serverModuleContent = filesystem.read(serverModule);
|
|
254
|
+
if (serverModuleContent && !serverModuleContent.includes('forwardRef')) {
|
|
255
|
+
// Add forwardRef to @nestjs/common import
|
|
256
|
+
yield patching.patch(serverModule, {
|
|
257
|
+
insert: '$1, forwardRef$2',
|
|
258
|
+
replace: /from '@nestjs\/common'(.*?)}/,
|
|
259
|
+
});
|
|
260
|
+
}
|
|
261
|
+
else if (serverModuleContent && serverModuleContent.includes('@nestjs/common') && !serverModuleContent.match(/forwardRef.*@nestjs\/common|@nestjs\/common.*forwardRef/)) {
|
|
262
|
+
// forwardRef exists but not in @nestjs/common import - add it
|
|
263
|
+
yield patching.patch(serverModule, {
|
|
264
|
+
insert: '$1, forwardRef$2',
|
|
265
|
+
replace: /(\w+)\s*}\s*from\s+'@nestjs\/common'/,
|
|
266
|
+
});
|
|
267
|
+
}
|
|
160
268
|
}
|
|
161
269
|
// Add comma if necessary
|
|
162
270
|
yield patching.patch(serverModule, {
|
|
@@ -188,8 +296,13 @@ const NewCommand = {
|
|
|
188
296
|
const nextObj = objectsToAdd.shift().object;
|
|
189
297
|
yield object_1.default.run(toolbox, { currentItem: nextObj, objectsToAdd, preventExitProcess: true, referencesToAdd });
|
|
190
298
|
}
|
|
191
|
-
// Lint fix
|
|
192
|
-
|
|
299
|
+
// Lint fix with priority: CLI parameter > config > default (false)
|
|
300
|
+
const skipLint = config.getValue({
|
|
301
|
+
cliValue: cliSkipLint,
|
|
302
|
+
configValue: configSkipLint,
|
|
303
|
+
defaultValue: false,
|
|
304
|
+
});
|
|
305
|
+
if (!skipLint) {
|
|
193
306
|
if (yield confirm('Run lint fix?', true)) {
|
|
194
307
|
yield system.run('npm run lint:fix');
|
|
195
308
|
}
|
|
@@ -209,4 +322,4 @@ const NewCommand = {
|
|
|
209
322
|
}),
|
|
210
323
|
};
|
|
211
324
|
exports.default = NewCommand;
|
|
212
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"module.js","sourceRoot":"","sources":["../../../src/commands/server/module.ts"],"names":[],"mappings":"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"}
|
|
325
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"module.js","sourceRoot":"","sources":["../../../src/commands/server/module.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,7 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
12
12
|
const path_1 = require("path");
|
|
13
13
|
const module_1 = require("./module");
|
|
14
14
|
/**
|
|
15
|
-
* Create a new server
|
|
15
|
+
* Create a new server object
|
|
16
16
|
*/
|
|
17
17
|
const NewCommand = {
|
|
18
18
|
alias: ['o'],
|
|
@@ -20,10 +20,11 @@ const NewCommand = {
|
|
|
20
20
|
hidden: false,
|
|
21
21
|
name: 'object',
|
|
22
22
|
run: (toolbox, options) => __awaiter(void 0, void 0, void 0, function* () {
|
|
23
|
+
var _a, _b, _c;
|
|
23
24
|
// Options:
|
|
24
25
|
const { currentItem, objectsToAdd, preventExitProcess, referencesToAdd } = Object.assign({ currentItem: '', objectsToAdd: [], preventExitProcess: false, referencesToAdd: [] }, options);
|
|
25
26
|
// Retrieve the tools we need
|
|
26
|
-
const { filesystem, helper, parameters, print: { divider, error, info, spin, success }, prompt: { confirm }, server, strings: { camelCase, kebabCase, pascalCase }, system, template, } = toolbox;
|
|
27
|
+
const { config, filesystem, helper, parameters, print: { divider, error, info, spin, success }, prompt: { confirm }, server, strings: { camelCase, kebabCase, pascalCase }, system, template, } = toolbox;
|
|
27
28
|
// Start timer
|
|
28
29
|
const timer = system.startTimer();
|
|
29
30
|
// Info
|
|
@@ -33,6 +34,9 @@ const NewCommand = {
|
|
|
33
34
|
else {
|
|
34
35
|
info('Create a new server object (with inputs)');
|
|
35
36
|
}
|
|
37
|
+
// Load configuration
|
|
38
|
+
const ltConfig = config.loadConfig();
|
|
39
|
+
const configSkipLint = (_c = (_b = (_a = ltConfig === null || ltConfig === void 0 ? void 0 : ltConfig.commands) === null || _a === void 0 ? void 0 : _a.server) === null || _b === void 0 ? void 0 : _b.object) === null || _c === void 0 ? void 0 : _c.skipLint;
|
|
36
40
|
// Parse CLI arguments
|
|
37
41
|
const { name: cliName, skipLint: cliSkipLint } = parameters.options;
|
|
38
42
|
// Get name
|
|
@@ -67,10 +71,9 @@ const NewCommand = {
|
|
|
67
71
|
// Parse properties from CLI or interactive mode
|
|
68
72
|
const { props, refsSet, schemaSet } = yield toolbox.parseProperties({ objectsToAdd, referencesToAdd });
|
|
69
73
|
const generateSpinner = spin('Generate files');
|
|
70
|
-
const
|
|
71
|
-
const
|
|
72
|
-
const
|
|
73
|
-
const objectTemplate = server.propsForModel(props, { declare, modelName: name });
|
|
74
|
+
const inputTemplate = server.propsForInput(props, { modelName: name, nullable: true });
|
|
75
|
+
const createTemplate = server.propsForInput(props, { create: true, modelName: name, nullable: false });
|
|
76
|
+
const objectTemplate = server.propsForModel(props, { modelName: name });
|
|
74
77
|
// nest-server-module/inputs/xxx.input.ts
|
|
75
78
|
yield template.generate({
|
|
76
79
|
props: { imports: inputTemplate.imports, nameCamel, nameKebab, namePascal, props: inputTemplate.props },
|
|
@@ -97,8 +100,13 @@ const NewCommand = {
|
|
|
97
100
|
template: 'nest-server-object/template.object.ts.ejs',
|
|
98
101
|
});
|
|
99
102
|
generateSpinner.succeed('Files generated');
|
|
100
|
-
// Lint fix
|
|
101
|
-
|
|
103
|
+
// Lint fix with priority: CLI parameter > config > default (false)
|
|
104
|
+
const skipLint = config.getValue({
|
|
105
|
+
cliValue: cliSkipLint,
|
|
106
|
+
configValue: configSkipLint,
|
|
107
|
+
defaultValue: false,
|
|
108
|
+
});
|
|
109
|
+
if (!skipLint) {
|
|
102
110
|
if (yield confirm('Run lint fix?', true)) {
|
|
103
111
|
yield system.run('npm run lint:fix');
|
|
104
112
|
}
|
|
@@ -107,18 +115,18 @@ const NewCommand = {
|
|
|
107
115
|
info('');
|
|
108
116
|
success(`Generated ${namePascal}Object in ${helper.msToMinutesAndSeconds(timer())}m.`);
|
|
109
117
|
info('');
|
|
110
|
-
// Add additional objects
|
|
111
|
-
if (objectsToAdd.length > 0) {
|
|
112
|
-
divider();
|
|
113
|
-
const nextObj = objectsToAdd.shift().object;
|
|
114
|
-
yield NewCommand.run(toolbox, { currentItem: nextObj, objectsToAdd, preventExitProcess: true, referencesToAdd });
|
|
115
|
-
}
|
|
116
118
|
// Add additional references
|
|
117
119
|
if (referencesToAdd.length > 0) {
|
|
118
120
|
divider();
|
|
119
121
|
const nextRef = referencesToAdd.shift().reference;
|
|
120
122
|
yield module_1.default.run(toolbox, { currentItem: nextRef, objectsToAdd, preventExitProcess: true, referencesToAdd });
|
|
121
123
|
}
|
|
124
|
+
// Add additional objects
|
|
125
|
+
if (objectsToAdd.length > 0) {
|
|
126
|
+
divider();
|
|
127
|
+
const nextObj = objectsToAdd.shift().object;
|
|
128
|
+
yield NewCommand.run(toolbox, { currentItem: nextObj, objectsToAdd, preventExitProcess: true, referencesToAdd });
|
|
129
|
+
}
|
|
122
130
|
// We're done, so show what to do next
|
|
123
131
|
if (!preventExitProcess) {
|
|
124
132
|
if (refsSet || schemaSet) {
|
|
@@ -133,4 +141,4 @@ const NewCommand = {
|
|
|
133
141
|
}),
|
|
134
142
|
};
|
|
135
143
|
exports.default = NewCommand;
|
|
136
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
144
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoib2JqZWN0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2NvbW1hbmRzL3NlcnZlci9vYmplY3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7QUFBQSwrQkFBNEI7QUFJNUIscUNBQWlDO0FBRWpDOztHQUVHO0FBQ0gsTUFBTSxVQUFVLEdBQTJCO0lBQ3pDLEtBQUssRUFBRSxDQUFDLEdBQUcsQ0FBQztJQUNaLFdBQVcsRUFBRSxvSkFBb0o7SUFDakssTUFBTSxFQUFFLEtBQUs7SUFDYixJQUFJLEVBQUUsUUFBUTtJQUNkLEdBQUcsRUFBRSxDQUNILE9BQStCLEVBQy9CLE9BS0MsRUFDRCxFQUFFOztRQUVGLFdBQVc7UUFDWCxNQUFNLEVBQUUsV0FBVyxFQUFFLFlBQVksRUFBRSxrQkFBa0IsRUFBRSxlQUFlLEVBQUUsbUJBQ3RFLFdBQVcsRUFBRSxFQUFFLEVBQ2YsWUFBWSxFQUFFLEVBQUUsRUFDaEIsa0JBQWtCLEVBQUUsS0FBSyxFQUN6QixlQUFlLEVBQUUsRUFBRSxJQUNoQixPQUFPLENBQ1gsQ0FBQztRQUVGLDZCQUE2QjtRQUM3QixNQUFNLEVBQ0osTUFBTSxFQUNOLFVBQVUsRUFDVixNQUFNLEVBQ04sVUFBVSxFQUNWLEtBQUssRUFBRSxFQUFFLE9BQU8sRUFBRSxLQUFLLEVBQUUsSUFBSSxFQUFFLElBQUksRUFBRSxPQUFPLEVBQUUsRUFDOUMsTUFBTSxFQUFFLEVBQUUsT0FBTyxFQUFFLEVBQ25CLE1BQU0sRUFDTixPQUFPLEVBQUUsRUFBRSxTQUFTLEVBQUUsU0FBUyxFQUFFLFVBQVUsRUFBRSxFQUM3QyxNQUFNLEVBQ04sUUFBUSxHQUNULEdBQUcsT0FBTyxDQUFDO1FBRVosY0FBYztRQUNkLE1BQU0sS0FBSyxHQUFHLE1BQU0sQ0FBQyxVQUFVLEVBQUUsQ0FBQztRQUVsQyxPQUFPO1FBQ1AsSUFBSSxXQUFXLEVBQUUsQ0FBQztZQUNoQixJQUFJLENBQUMsZ0RBQWdELFdBQVcsRUFBRSxD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
|
|
@@ -0,0 +1,157 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.Config = void 0;
|
|
4
|
+
const _ = require("lodash");
|
|
5
|
+
const path_1 = require("path");
|
|
6
|
+
/**
|
|
7
|
+
* Config helper functions for loading and merging lt.config.json files
|
|
8
|
+
*/
|
|
9
|
+
class Config {
|
|
10
|
+
constructor(filesystem) {
|
|
11
|
+
this.filesystem = filesystem;
|
|
12
|
+
}
|
|
13
|
+
/**
|
|
14
|
+
* Load configuration from lt.config.json files
|
|
15
|
+
* Searches from current directory up to root, merging configurations
|
|
16
|
+
*
|
|
17
|
+
* Priority (lowest to highest):
|
|
18
|
+
* 1. Default values
|
|
19
|
+
* 2. Config from parent directories (higher up = lower priority)
|
|
20
|
+
* 3. Config from current directory
|
|
21
|
+
* 4. CLI parameters
|
|
22
|
+
* 5. Interactive user input
|
|
23
|
+
*
|
|
24
|
+
* @param startPath - Starting directory (defaults to current working directory)
|
|
25
|
+
* @returns Merged configuration object
|
|
26
|
+
*/
|
|
27
|
+
loadConfig(startPath) {
|
|
28
|
+
const start = startPath || this.filesystem.cwd();
|
|
29
|
+
const configs = [];
|
|
30
|
+
// Search from current directory up to root
|
|
31
|
+
let currentPath = start;
|
|
32
|
+
const root = this.filesystem.separator === '/' ? '/' : /^[A-Z]:\\$/i;
|
|
33
|
+
while (true) {
|
|
34
|
+
const configPath = (0, path_1.join)(currentPath, 'lt.config.json');
|
|
35
|
+
if (this.filesystem.exists(configPath)) {
|
|
36
|
+
try {
|
|
37
|
+
const config = this.filesystem.read(configPath, 'json');
|
|
38
|
+
if (config) {
|
|
39
|
+
// Add to beginning (parent configs have lower priority)
|
|
40
|
+
configs.unshift(config);
|
|
41
|
+
}
|
|
42
|
+
}
|
|
43
|
+
catch (error) {
|
|
44
|
+
// Invalid JSON, skip this config file
|
|
45
|
+
console.warn(`Warning: Invalid JSON in ${configPath}`);
|
|
46
|
+
}
|
|
47
|
+
}
|
|
48
|
+
// Check if we've reached the root
|
|
49
|
+
const parent = this.filesystem.path(currentPath, '..');
|
|
50
|
+
if (parent === currentPath || (typeof root !== 'string' && root.test(currentPath))) {
|
|
51
|
+
break;
|
|
52
|
+
}
|
|
53
|
+
currentPath = parent;
|
|
54
|
+
}
|
|
55
|
+
// Merge all configs (later configs override earlier ones)
|
|
56
|
+
return this.mergeConfigs(...configs);
|
|
57
|
+
}
|
|
58
|
+
/**
|
|
59
|
+
* Merge multiple config objects
|
|
60
|
+
* Later configs override earlier ones
|
|
61
|
+
*
|
|
62
|
+
* Uses lodash mergeWith with custom handling:
|
|
63
|
+
* - Source objects are merged into the destination object
|
|
64
|
+
* - Source objects are applied from left to right
|
|
65
|
+
* - Subsequent sources overwrite property assignments of previous sources
|
|
66
|
+
* - Arrays are not merged but overwrite arrays of previous sources
|
|
67
|
+
*
|
|
68
|
+
* @param configs - Config objects to merge
|
|
69
|
+
* @returns Merged configuration
|
|
70
|
+
*/
|
|
71
|
+
mergeConfigs(...configs) {
|
|
72
|
+
const merged = {};
|
|
73
|
+
// Filter out null/undefined configs
|
|
74
|
+
const validConfigs = configs.filter((c) => c !== null && c !== undefined);
|
|
75
|
+
if (validConfigs.length === 0) {
|
|
76
|
+
return merged;
|
|
77
|
+
}
|
|
78
|
+
// Use lodash mergeWith with array override behavior
|
|
79
|
+
return _.mergeWith(merged, ...validConfigs, (objValue, srcValue) => {
|
|
80
|
+
// If source value is an array, replace rather than merge
|
|
81
|
+
if (Array.isArray(srcValue)) {
|
|
82
|
+
return srcValue;
|
|
83
|
+
}
|
|
84
|
+
// Otherwise, use default merge behavior
|
|
85
|
+
return undefined;
|
|
86
|
+
});
|
|
87
|
+
}
|
|
88
|
+
/**
|
|
89
|
+
* Get a configuration value with priority handling
|
|
90
|
+
*
|
|
91
|
+
* Priority (lowest to highest):
|
|
92
|
+
* 1. defaultValue
|
|
93
|
+
* 2. Config file value
|
|
94
|
+
* 3. CLI parameter value
|
|
95
|
+
* 4. Interactive value (if provided)
|
|
96
|
+
*
|
|
97
|
+
* @param options - Configuration options
|
|
98
|
+
* @returns The value according to priority
|
|
99
|
+
*/
|
|
100
|
+
getValue(options) {
|
|
101
|
+
const { cliValue, configValue, defaultValue, interactiveValue } = options;
|
|
102
|
+
// Priority: interactive > cli > config > default
|
|
103
|
+
if (interactiveValue !== undefined && interactiveValue !== null) {
|
|
104
|
+
return interactiveValue;
|
|
105
|
+
}
|
|
106
|
+
if (cliValue !== undefined && cliValue !== null) {
|
|
107
|
+
return cliValue;
|
|
108
|
+
}
|
|
109
|
+
if (configValue !== undefined && configValue !== null) {
|
|
110
|
+
return configValue;
|
|
111
|
+
}
|
|
112
|
+
return defaultValue;
|
|
113
|
+
}
|
|
114
|
+
/**
|
|
115
|
+
* Save configuration to lt.config.json in the specified directory
|
|
116
|
+
*
|
|
117
|
+
* @param config - Configuration to save
|
|
118
|
+
* @param targetPath - Directory to save config in (defaults to current directory)
|
|
119
|
+
*/
|
|
120
|
+
saveConfig(config, targetPath) {
|
|
121
|
+
const path = targetPath || this.filesystem.cwd();
|
|
122
|
+
const configPath = (0, path_1.join)(path, 'lt.config.json');
|
|
123
|
+
this.filesystem.write(configPath, config, { jsonIndent: 2 });
|
|
124
|
+
}
|
|
125
|
+
/**
|
|
126
|
+
* Update an existing configuration file or create a new one
|
|
127
|
+
* Merges with existing config if it exists
|
|
128
|
+
*
|
|
129
|
+
* @param config - Configuration updates to apply
|
|
130
|
+
* @param targetPath - Directory containing config file (defaults to current directory)
|
|
131
|
+
*/
|
|
132
|
+
updateConfig(config, targetPath) {
|
|
133
|
+
const path = targetPath || this.filesystem.cwd();
|
|
134
|
+
const configPath = (0, path_1.join)(path, 'lt.config.json');
|
|
135
|
+
let existing = {};
|
|
136
|
+
if (this.filesystem.exists(configPath)) {
|
|
137
|
+
try {
|
|
138
|
+
existing = this.filesystem.read(configPath, 'json');
|
|
139
|
+
}
|
|
140
|
+
catch (error) {
|
|
141
|
+
// Invalid JSON, will overwrite
|
|
142
|
+
existing = {};
|
|
143
|
+
}
|
|
144
|
+
}
|
|
145
|
+
const merged = this.mergeConfigs(existing, config);
|
|
146
|
+
this.saveConfig(merged, path);
|
|
147
|
+
}
|
|
148
|
+
}
|
|
149
|
+
exports.Config = Config;
|
|
150
|
+
/**
|
|
151
|
+
* Extension function to add config helper to toolbox
|
|
152
|
+
*/
|
|
153
|
+
exports.default = (toolbox) => {
|
|
154
|
+
const config = new Config(toolbox.filesystem);
|
|
155
|
+
toolbox.config = config;
|
|
156
|
+
};
|
|
157
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uZmlnLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2V4dGVuc2lvbnMvY29uZmlnLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUNBLDRCQUE0QjtBQUM1QiwrQkFBNEI7QUFJNUI7O0dBRUc7QUFDSCxNQUFhLE1BQU07SUFHakIsWUFBWSxVQUE2QjtRQUN2QyxJQUFJLENBQUMsVUFBVSxHQUFHLFVBQVUsQ0FBQztJQUMvQixDQUFDO0lBRUQ7Ozs7Ozs7Ozs7Ozs7T0FhRztJQUNILFVBQVUsQ0FBQyxTQUFrQjtRQUMzQixNQUFNLEtBQUssR0FBRyxTQUFTLElBQUksSUFBSSxDQUFDLFVBQVUsQ0FBQyxHQUFHLEVBQUUsQ0FBQztRQUNqRCxNQUFNLE9BQU8sR0FBZSxFQUFFLENBQUM7UUFFL0IsMkNBQTJDO1FBQzNDLElBQUksV0FBVyxHQUFHLEtBQUssQ0FBQztRQUN4QixNQUFNLElBQUksR0FBRyxJQUFJLENBQUMsVUFBVSxDQUFDLFNBQVMsS0FBSyxHQUFHLENBQUMsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsYUFBYSxDQUFDO1FBRXJFLE9BQU8sSUFBSSxFQUFFLENBQUM7WUFDWixNQUFNLFVBQVUsR0FBRyxJQUFBLFdBQUksRUFBQyxXQUFXLEVBQUUsZ0JBQWdCLENBQUMsQ0FBQztZQUV2RCxJQUFJLElBQUksQ0FBQyxVQUFVLENBQUMsTUFBTSxDQUFDLFVBQVUsQ0FBQyxFQUFFLENBQUM7Z0JBQ3ZDLElBQUksQ0FBQztvQkFDSCxNQUFNLE1BQU0sR0FBRyxJQUFJLENBQUMsVUFBVSxDQUFDLElBQUksQ0FBQyxVQUFVLEVBQUUsTUFBTSxDQUFhLENBQUM7b0JBQ3BFLElBQUksTUFBTSxFQUFFLENBQUM7d0JBQ1gsd0RBQXdEO3dCQUN4RCxPQUFPLENBQUMsT0FBTyxDQUFDLE1BQU0sQ0FBQyxDQUFDO29CQUMxQixDQUFDO2dCQUNILENBQUM7Z0JBQUMsT0FBTyxLQUFLLEVBQUUsQ0FBQztvQkFDZixz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
|