@lenne.tech/cli 0.0.124 → 0.0.125
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/claude/claude.js +25 -0
- package/build/commands/claude/install-skill.js +93 -0
- package/build/commands/fullstack/init.js +38 -16
- package/build/commands/server/add-property.js +38 -11
- package/build/commands/server/module.js +21 -11
- package/build/commands/server/object.js +17 -9
- package/build/extensions/parse-properties.js +119 -0
- package/build/templates/claude-skills/lt-cli/SKILL.md +341 -0
- package/build/templates/claude-skills/lt-cli/examples.md +312 -0
- package/build/templates/claude-skills/lt-cli/reference.md +332 -0
- package/package.json +1 -1
|
@@ -0,0 +1,25 @@
|
|
|
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
|
+
/**
|
|
13
|
+
* Claude commands
|
|
14
|
+
*/
|
|
15
|
+
module.exports = {
|
|
16
|
+
alias: ['c'],
|
|
17
|
+
description: 'Claude commands',
|
|
18
|
+
hidden: true,
|
|
19
|
+
name: 'claude',
|
|
20
|
+
run: (toolbox) => __awaiter(void 0, void 0, void 0, function* () {
|
|
21
|
+
yield toolbox.helper.showMenu('claude');
|
|
22
|
+
return 'claude';
|
|
23
|
+
}),
|
|
24
|
+
};
|
|
25
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xhdWRlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2NvbW1hbmRzL2NsYXVkZS9jbGF1ZGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7QUFFQTs7R0FFRztBQUNILE1BQU0sQ0FBQyxPQUFPLEdBQUc7SUFDZixLQUFLLEVBQUUsQ0FBQyxHQUFHLENBQUM7SUFDWixXQUFXLEVBQUUsaUJBQWlCO0lBQzlCLE1BQU0sRUFBRSxJQUFJO0lBQ1osSUFBSSxFQUFFLFFBQVE7SUFDZCxHQUFHLEVBQUUsQ0FBTyxPQUErQixFQUFFLEVBQUU7UUFDN0MsTUFBTSxPQUFPLENBQUMsTUFBTSxDQUFDLFFBQVEsQ0FBQyxRQUFRLENBQUMsQ0FBQztRQUN4QyxPQUFPLFFBQVEsQ0FBQztJQUNsQixDQUFDLENBQUE7Q0FDRixDQUFDIn0=
|
|
@@ -0,0 +1,93 @@
|
|
|
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
|
+
const os_1 = require("os");
|
|
13
|
+
const path_1 = require("path");
|
|
14
|
+
/**
|
|
15
|
+
* Install LT CLI Skill to ~/.claude/skills/lt-cli/
|
|
16
|
+
*/
|
|
17
|
+
const NewCommand = {
|
|
18
|
+
alias: ['skill', 'is'],
|
|
19
|
+
description: 'Installs the LT CLI Skill to ~/.claude/skills/ for Claude Code integration. The skill helps Claude generate correct LT CLI commands.',
|
|
20
|
+
hidden: false,
|
|
21
|
+
name: 'install-skill',
|
|
22
|
+
run: (toolbox) => __awaiter(void 0, void 0, void 0, function* () {
|
|
23
|
+
// Retrieve the tools we need
|
|
24
|
+
const { filesystem, print: { error, info, spin, success }, } = toolbox;
|
|
25
|
+
const installSpinner = spin('Installing LT CLI Skill to ~/.claude/skills/lt-cli/');
|
|
26
|
+
try {
|
|
27
|
+
// Get the CLI installation directory
|
|
28
|
+
const cliRoot = (0, path_1.join)(__dirname, '..', '..');
|
|
29
|
+
const templatesDir = (0, path_1.join)(cliRoot, 'templates', 'claude-skills', 'lt-cli');
|
|
30
|
+
// Check if templates exist
|
|
31
|
+
if (!filesystem.exists(templatesDir)) {
|
|
32
|
+
installSpinner.fail();
|
|
33
|
+
error('Skill templates not found in CLI installation.');
|
|
34
|
+
info(`Expected location: ${templatesDir}`);
|
|
35
|
+
info('Please reinstall the CLI or report this issue.');
|
|
36
|
+
return;
|
|
37
|
+
}
|
|
38
|
+
// Create ~/.claude/skills/lt-cli directory
|
|
39
|
+
const skillsDir = (0, path_1.join)((0, os_1.homedir)(), '.claude', 'skills', 'lt-cli');
|
|
40
|
+
if (!filesystem.exists(skillsDir)) {
|
|
41
|
+
filesystem.dir(skillsDir);
|
|
42
|
+
}
|
|
43
|
+
// Copy all skill files
|
|
44
|
+
const skillFiles = ['SKILL.md', 'examples.md', 'reference.md'];
|
|
45
|
+
let copiedCount = 0;
|
|
46
|
+
for (const file of skillFiles) {
|
|
47
|
+
const sourcePath = (0, path_1.join)(templatesDir, file);
|
|
48
|
+
const targetPath = (0, path_1.join)(skillsDir, file);
|
|
49
|
+
if (filesystem.exists(sourcePath)) {
|
|
50
|
+
const content = filesystem.read(sourcePath);
|
|
51
|
+
filesystem.write(targetPath, content);
|
|
52
|
+
copiedCount++;
|
|
53
|
+
}
|
|
54
|
+
else {
|
|
55
|
+
info(`Warning: ${file} not found in templates, skipping...`);
|
|
56
|
+
}
|
|
57
|
+
}
|
|
58
|
+
if (copiedCount === 0) {
|
|
59
|
+
installSpinner.fail();
|
|
60
|
+
error('No skill files were copied.');
|
|
61
|
+
return;
|
|
62
|
+
}
|
|
63
|
+
installSpinner.succeed(`Successfully installed LT CLI Skill to ${skillsDir}`);
|
|
64
|
+
info('');
|
|
65
|
+
success('The LT CLI Skill is now available in Claude Code!');
|
|
66
|
+
info('');
|
|
67
|
+
info('Claude will automatically use this skill when you:');
|
|
68
|
+
info(' • Create server modules, objects, or properties');
|
|
69
|
+
info(' • Work with NestJS/TypeScript backend code');
|
|
70
|
+
info(' • Ask for help with LT CLI commands');
|
|
71
|
+
info('');
|
|
72
|
+
info('Try it out by asking Claude:');
|
|
73
|
+
info(' "Create a User module with email and username"');
|
|
74
|
+
info('');
|
|
75
|
+
info(`Files installed: ${copiedCount} of ${skillFiles.length}`);
|
|
76
|
+
info(`Location: ${skillsDir}`);
|
|
77
|
+
}
|
|
78
|
+
catch (err) {
|
|
79
|
+
installSpinner.fail();
|
|
80
|
+
error(`Failed to install skill: ${err.message}`);
|
|
81
|
+
info('');
|
|
82
|
+
info('Troubleshooting:');
|
|
83
|
+
info(' • Ensure ~/.claude directory exists and is writable');
|
|
84
|
+
info(' • Check file permissions');
|
|
85
|
+
info(' • Try running with sudo if permission issues persist');
|
|
86
|
+
return;
|
|
87
|
+
}
|
|
88
|
+
// For tests
|
|
89
|
+
return 'claude install-skill';
|
|
90
|
+
}),
|
|
91
|
+
};
|
|
92
|
+
exports.default = NewCommand;
|
|
93
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5zdGFsbC1za2lsbC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9jb21tYW5kcy9jbGF1ZGUvaW5zdGFsbC1za2lsbC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7OztBQUNBLDJCQUE2QjtBQUM3QiwrQkFBNEI7QUFJNUI7O0dBRUc7QUFDSCxNQUFNLFVBQVUsR0FBbUI7SUFDakMsS0FBSyxFQUFFLENBQUMsT0FBTyxFQUFFLElBQUksQ0FBQztJQUN0QixXQUFXLEVBQUUsc0lBQXNJO0lBQ25KLE1BQU0sRUFBRSxLQUFLO0lBQ2IsSUFBSSxFQUFFLGVBQWU7SUFDckIsR0FBRyxFQUFFLENBQU8sT0FBK0IsRUFBRSxFQUFFO1FBQzdDLDZCQUE2QjtRQUM3QixNQUFNLEVBQ0osVUFBVSxFQUNWLEtBQUssRUFBRSxFQUFFLEtBQUssRUFBRSxJQUFJLEVBQUUsSUFBSSxFQUFFLE9BQU8sRUFBRSxHQUN0QyxHQUFHLE9BQU8sQ0FBQztRQUVaLE1BQU0sY0FBYyxHQUFHLElBQUksQ0FBQyxxREFBcUQsQ0FBQyxDQUFDO1FBRW5GLElBQUksQ0FBQztZQUNILHFDQUFxQztZQUNyQyxNQUFNLE9BQU8sR0FBRyxJQUFBLFdBQUksRUFBQyxTQUFTLEVBQUUsSUFBSSxFQUFFLElBQUksQ0FBQyxDQUFDO1lBQzVDLE1BQU0sWUFBWSxHQUFHLElBQUEsV0FBSSxFQUFDLE9BQU8sRUFBRSxXQUFXLEVBQUUsZUFBZSxFQUFFLFFBQVEsQ0FBQyxDQUFDO1lBRTNFLDJCQUEyQjtZQUMzQixJQUFJLENBQUMsVUFBVSxDQUFDLE1BQU0sQ0FBQyxZQUFZLENBQUMsRUFBRSxDQUFDO2dCQUNyQyxjQUFjLENBQUMsSUFBSSxFQUFFLENBQUM7Z0JBQ3RCLEtBQUssQ0FBQyxnREFBZ0QsQ0FBQyxDQUFDO2dCQUN4RCxJQUFJLENBQUMsc0JBQXNCLFlBQVksRUFBRSxDQUFDLENBQUM7Z0JBQzNDLElBQUksQ0FBQyxnREFBZ0QsQ0FBQyxD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
|
|
@@ -15,7 +15,7 @@ const gluegun_1 = require("gluegun");
|
|
|
15
15
|
*/
|
|
16
16
|
const NewCommand = {
|
|
17
17
|
alias: ['init'],
|
|
18
|
-
description: 'Creates a new fullstack workspace',
|
|
18
|
+
description: 'Creates a new fullstack workspace. Use --name <WorkspaceName>, --frontend (angular|nuxt), --git (true|false), --git-link <GitURL> for non-interactive mode.',
|
|
19
19
|
hidden: false,
|
|
20
20
|
name: 'init',
|
|
21
21
|
run: (toolbox) => __awaiter(void 0, void 0, void 0, function* () {
|
|
@@ -29,11 +29,13 @@ const NewCommand = {
|
|
|
29
29
|
if (!(yield git.gitInstalled())) {
|
|
30
30
|
return;
|
|
31
31
|
}
|
|
32
|
+
// Parse CLI arguments
|
|
33
|
+
const { frontend: cliFrontend, git: cliGit, 'git-link': cliGitLink, name: cliName } = parameters.options;
|
|
32
34
|
// Get name of the workspace
|
|
33
|
-
const name = yield helper.getInput(parameters.first, {
|
|
35
|
+
const name = cliName || (yield helper.getInput(parameters.first, {
|
|
34
36
|
name: 'workspace name',
|
|
35
37
|
showError: true,
|
|
36
|
-
});
|
|
38
|
+
}));
|
|
37
39
|
if (!name) {
|
|
38
40
|
return;
|
|
39
41
|
}
|
|
@@ -45,23 +47,43 @@ const NewCommand = {
|
|
|
45
47
|
error(`There's already a folder named "${projectDir}" here.`);
|
|
46
48
|
return undefined;
|
|
47
49
|
}
|
|
48
|
-
let frontend
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
}
|
|
56
|
-
else if (frontend === 'n') {
|
|
57
|
-
frontend = 'nuxt';
|
|
50
|
+
let frontend;
|
|
51
|
+
if (cliFrontend) {
|
|
52
|
+
frontend = cliFrontend === 'angular' ? 'angular' : cliFrontend === 'nuxt' ? 'nuxt' : null;
|
|
53
|
+
if (!frontend) {
|
|
54
|
+
error('Invalid frontend option. Use "angular" or "nuxt".');
|
|
55
|
+
return;
|
|
56
|
+
}
|
|
58
57
|
}
|
|
59
58
|
else {
|
|
60
|
-
|
|
59
|
+
frontend = (yield ask({
|
|
60
|
+
message: 'Angular (a) or Nuxt 3 (n)',
|
|
61
|
+
name: 'frontend',
|
|
62
|
+
type: 'input',
|
|
63
|
+
})).frontend;
|
|
64
|
+
if (frontend === 'a') {
|
|
65
|
+
frontend = 'angular';
|
|
66
|
+
}
|
|
67
|
+
else if (frontend === 'n') {
|
|
68
|
+
frontend = 'nuxt';
|
|
69
|
+
}
|
|
70
|
+
else {
|
|
71
|
+
process.exit();
|
|
72
|
+
}
|
|
61
73
|
}
|
|
62
74
|
let addToGit = false;
|
|
63
75
|
let gitLink;
|
|
64
|
-
if (
|
|
76
|
+
if (cliGit !== undefined) {
|
|
77
|
+
addToGit = cliGit === 'true' || cliGit === true;
|
|
78
|
+
if (addToGit && cliGitLink) {
|
|
79
|
+
gitLink = cliGitLink;
|
|
80
|
+
}
|
|
81
|
+
else if (addToGit) {
|
|
82
|
+
error('--git-link is required when --git is true');
|
|
83
|
+
return;
|
|
84
|
+
}
|
|
85
|
+
}
|
|
86
|
+
else if (parameters.third !== 'false') {
|
|
65
87
|
addToGit = parameters.third === 'true' || (yield confirm('Add workspace to a new git repository?'));
|
|
66
88
|
// Check if git init is active
|
|
67
89
|
if (addToGit) {
|
|
@@ -167,4 +189,4 @@ const NewCommand = {
|
|
|
167
189
|
}),
|
|
168
190
|
};
|
|
169
191
|
exports.default = NewCommand;
|
|
170
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
192
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5pdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9jb21tYW5kcy9mdWxsc3RhY2svaW5pdC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7OztBQUFBLHFDQUFtRDtBQUtuRDs7R0FFRztBQUNILE1BQU0sVUFBVSxHQUFtQjtJQUNqQyxLQUFLLEVBQUUsQ0FBQyxNQUFNLENBQUM7SUFDZixXQUFXLEVBQUUsNkpBQTZKO0lBQzFLLE1BQU0sRUFBRSxLQUFLO0lBQ2IsSUFBSSxFQUFFLE1BQU07SUFDWixHQUFHLEVBQUUsQ0FBTyxPQUErQixFQUFFLEVBQUU7UUFDN0MsNkJBQTZCO1FBQzdCLE1BQU0sRUFDSixVQUFVLEVBQ1YsR0FBRyxFQUNILE1BQU0sRUFDTixVQUFVLEVBQ1YsS0FBSyxFQUFFLEVBQUUsS0FBSyxFQUFFLElBQUksRUFBRSxJQUFJLEVBQUUsT0FBTyxFQUFFLEVBQ3JDLE1BQU0sRUFBRSxFQUFFLEdBQUcsRUFBRSxPQUFPLEVBQUUsRUFDeEIsTUFBTSxFQUNOLE9BQU8sRUFBRSxFQUFFLFNBQVMsRUFBRSxFQUN0QixNQUFNLEdBQ1AsR0FBRyxPQUFPLENBQUM7UUFFWixjQUFjO1FBQ2QsTUFBTSxLQUFLLEdBQUcsTUFBTSxDQUFDLFVBQVUsRUFBRSxDQUFDO1FBRWxDLE9BQU87UUFDUCxJQUFJLENBQUMsa0NBQWtDLENBQUMsQ0FBQztRQUV6QyxZQUFZO1FBQ1osSUFBSSxDQUFDLENBQUMsTUFBTSxHQUFHLENBQUMsWUFBWSxFQUFFLENBQUMsRUFBRSxDQUFDO1lBQ2hDLE9BQU87UUFDVCxDQUFDO1FBRUQsc0JBQXNCO1FBQ3RCLE1BQU0sRUFBRSxRQUFRLEVBQUUsV0FBVyxFQUFFLEdBQUcsRUFBRSxNQUFNLEVBQUUsVUFBVSxFQUFFLFVBQVUsRUFBRSxJQUFJLEVBQUUsT0FBTyxFQUFFLEdBQUcsVUFBVSxDQUFDLE9BQU8sQ0FBQztRQUV6Ryw0QkFBNEI7UUFDNUIsTUFBTSxJQUFJLEdBQUcsT0FBTyxLQUFJLE1BQU0sTUFBTSxDQUFDLFFBQVEsQ0FBQyxVQUFVLENBQUMsS0FBSyxFQUFFO1lBQzlELElBQUksRUFBRSxnQkFBZ0I7WUFDdEIsU0FBUyxFQUFFLElBQUk7U0FDaEIsQ0FBQyxDQUFBLENBQUM7UUFDSCxJQUFJLENBQUMsSUFBSSxFQUFFLENBQUM7WUFDVixPQUFPO1FBQ1QsQ0FBQztRQUVELHdCQUF3QjtRQUN4QixNQUFNLFVBQVUsR0FBRyxTQUFTLENBQUMsSUFBSSxDQUFDLENBQUM7UUFFbkMsb0NBQW9DO1FBQ3BDLElBQUksVUFBVSxDQUFDLE1BQU0sQ0FBQyxVQUFVLENBQUMsRUFBRSxDQUFDO1lBQ2xDLElBQUksQ0FBQyxFQUFFLENBQUMsQ0FBQztZQUNULEtBQUssQ0FBQyxtQ0FBbUMsVUFBVSxTQUFTLENBQUMsQ0FBQztZQUM5RCxPQUFPLFNBQVMsQ0FBQztRQUNuQixDQUFDO1FBRUQsSUFBSSxRQUFRLENBQUM7UUFDYixJQUFJLFdBQVcsRUFBRSxDQUFDO1lBQ2hCLFFBQVEsR0FBRyxXQUFXLEtBQUssU0FBUyxDQUFDLENBQUMsQ0FBQyxTQUFTLENBQUMsQ0FBQyxDQUFDLFdBQVcsS0FBSyxNQUFNLENBQUMsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDO1lBQzFGLElBQUksQ0FBQyxRQUFRLEVBQUUsQ0FBQztnQkFDZCxLQUFLLENBQUMsbURBQW1ELENBQUMsQ0FBQztnQkFDM0QsT0FBTztZQUNULENBQUM7UUFDSCxDQUFDO2FBQU0sQ0FBQztZQUNOLFFBQVEsR0FBRyxDQUNULE1BQU0sR0FBRyxDQUFDO2dCQUNSLE9BQU8sRUFBRSwyQkFBMkI7Z0JBQ3BDLElBQUksRUFBRSxVQUFVO2dCQUNoQixJQUFJLEVBQUUsT0FBTzthQUNkLENBQUMsQ0FDSCxDQUFDLFFBQVEsQ0FBQztZQUVYLElBQUksUUFBUSxLQUFLLEdBQUcsRUFBRSxDQUFDO2dCQUNyQixRQUFRLEdBQUcsU0FBUyxDQUFDO1lBQ3ZCLENBQUM7aUJBQU0sSUFBSSxRQUFRLEtBQUssR0FBRyxFQUFFLENBQUM7Z0JBQzVCLFFBQVEsR0FBRyxNQUFNLENBQUM7WUFDcEIsQ0FBQztpQkFBTSxDQUFDO2dCQUNOLE9BQU8sQ0FBQyxJQUFJLEVBQUUsQ0FBQztZQUNqQixDQUFDO1FBQ0gsQ0FBQztRQUVELElBQUksUUFBUSxHQUFHLEtBQUssQ0FBQztRQUNyQixJQUFJLE9BQU8sQ0FBQztRQUNaLElBQUksTUFBTSxLQUFLLFNBQVMsRUFBRSxDQUFDO1lBQ3pCLFFBQVEsR0FBRyxNQUFNLEtBQUssTUFBTSxJQUFJLE1BQU0sS0FBSyxJQUFJLENBQUM7WUFDaEQsSUFBSSxRQUFRLElBQUksVUFBVSxFQUFFLENBQUM7Z0JBQzNCLE9BQU8sR0FBRyxVQUFVLENBQUM7WUFDdkIsQ0FBQztpQkFBTSxJQUFJLFFBQVEsRUFBRSxDQUFDO2dCQUNwQixLQUFLLENBQUMsMkNBQTJDLENBQUMsQ0FBQztnQkFDbkQsT0FBTztZQUNULENBQUM7UUFDSCxDQUFDO2FBQU0sSUFBSSxVQUFVLENBQUMsS0FBSyxLQUFLLE9BQU8sRUFBRSxDQUFDO1lBQ3hDLFFBQVEsR0FBRyxVQUFVLENBQUMsS0FBSyxLQUFLLE1BQU0sSUFBSSxDQUFDLE1BQU0sT0FBTyxDQUFDLHdDQUF3QyxDQUFDLENBQUMsQ0FBQztZQUVwRyw4QkFBOEI7WUFDOUIsSUFBSSxRQUFRLEVBQUUsQ0FBQztnQkFDYixzQkFBc0I7Z0JBQ3RCLE9BQU8sR0FBRyxNQUFNLE1BQU0sQ0FBQyxRQUFRLENBQUMsSUFBSSxFQUFFO29CQUNwQyxJQUFJLEVBQUUscUJBQXFCO29CQUMzQixTQUFTLEVBQUUsSUFBSTtpQkFDaEIsQ0FBQyxDQUFDO2dCQUNILElBQUksQ0FBQyxPQUFPLEVBQUUsQ0FBQztvQkFDYixRQUFRLEdBQUcsS0FBSyxDQUFDO2dCQUNuQixDQUFDO1lBQ0gsQ0FBQztRQUNILENBQUM7UUFFRCxNQUFNLGdCQUFnQixHQUFHLElBQUksQ0FBQyxtQ0FBbUMsUUFBUSxPQUFPLFVBQVUsU0FBUyxJQUFJLE1BQU0sQ0FBQyxDQUFDO1FBRS9HLGlCQUFpQjtRQUNqQixNQUFNLE1BQU0sQ0FBQyxHQUFHLENBQUMsMERBQTBELFVBQVUsRUFBRSxDQUFDLENBQUM7UUFFekYsc0JBQXNCO1FBQ3RCLElBQUksQ0FBQyxVQUFVLENBQUMsV0FBVyxDQUFDLEtBQUssVUFBVSxFQUFFLENBQUMsRUFBRSxDQUFDO1lBQy9DLEtBQUssQ0FBQyxrQkFBa0IsVUFBVSx5QkFBeUIsQ0FBQyxDQUFDO1lBQzdELE9BQU8sU0FBUyxDQUFDO1FBQ25CLENBQUM7UUFFRCxnQkFBZ0IsQ0FBQyxPQUFPLENBQUMsbUNBQW1DLFFBQVEsT0FBTyxVQUFVLFFBQVEsSUFBSSxVQUFVLENBQUMsQ0FBQztRQUU3RyxzQkFBc0I7UUFDdEIsTUFBTSxhQUFhLEdBQUcsSUFBSSxDQUFDLHlCQUF5QixRQUFRLEVBQUUsQ0FBQyxDQUFDO1FBRWhFLGdDQUFnQztRQUNoQyxVQUFVLENBQUMsTUFBTSxDQUFDLEdBQUcsVUFBVSxPQUFPLENBQUMsQ0FBQztRQUV4Qyw4QkFBOEI7UUFDOUIsSUFBSSxRQUFRLEVBQUUsQ0FBQztZQUNiLE1BQU0sTUFBTSxDQUFDLEdBQUcsQ0FBQyxNQUFNLFVBQVUsbUNBQW1DLENBQUMsQ0FBQztZQUN0RSxNQUFNLE1BQU0sQ0FBQyxHQUFHLENBQUMsTUFBTSxVQUFVLDZCQUE2QixPQUFPLEVBQUUsQ0FBQyxDQUFDO1lBQ3pFLE1BQU0sTUFBTSxDQUFDLEdBQUcsQ0FBQyxNQUFNLFVBQVUsZUFBZSxDQUFDLENBQUM7WUFDbEQsTUFBTSxNQUFNLENBQUMsR0FBRyxDQUFDLE1BQU0sVUFBVSxvQ0FBb0MsQ0FBQyxDQUFDO1lBQ3ZFLE1BQU0sTUFBTSxDQUFDLEdBQUcsQ0FBQyxNQUFNLFVBQVUsNEJBQTRCLENBQUMsQ0FBQztRQUNqRSxDQUFDO1FBRUQsSUFBSSxRQUFRLEtBQUssU0FBUyxFQUFFLENBQUM7WUFDM0Isd0JBQXdCO1lBQ3hCLE1BQU0sTUFBTSxDQUFDLEdBQUcsQ0FBQyxNQUFNLFVBQVUsNkVBQTZFLENBQUMsQ0FBQztRQUNsSCxDQUFDO2FBQU0sQ0FBQztZQUNOLE1BQU0sTUFBTSxDQUFDLEdBQUcsQ0FBQywyQkFBMkIsQ0FBQyxDQUFDO1lBQzlDLE1BQU0sTUFBTSxDQUFDLEdBQUcsQ0FBQyxNQUFNLFVBQVUsbUNBQW1DLENBQUMsQ0FBQztRQUN4RSxDQUFDO1FBRUQsc0JBQXNCO1FBQ3RCLFVBQVUsQ0FBQyxNQUFNLENBQUMsR0FBRyxVQUFVLG9CQUFvQixDQUFDLENBQUM7UUFFckQsZ0NBQWdDO1FBQ2hDLFVBQVUsQ0FBQyxNQUFNLENBQUMsR0FBRyxVQUFVLG9CQUFvQixDQUFDLENBQUM7UUFFckQsa0JBQWtCO1FBQ2xCLElBQUksVUFBVSxDQUFDLFdBQVcsQ0FBQyxLQUFLLFVBQVUsZUFBZSxDQUFDLEVBQUUsQ0FBQztZQUMzRCw4QkFBOEI7WUFDOUIsSUFBSSxRQUFRLEVBQUUsQ0FBQztnQkFDYixpQkFBaUI7Z0JBQ2pCLE1BQU0sTUFBTSxDQUFDLEdBQUcsQ0FDZCxNQUFNLFVBQVUsMENBQTBDLFFBQVEsa0NBQWtDLENBQ3JHLENBQUM7WUFDSixDQUFDO1lBRUQsbUNBQW1DO1lBQ25DLGFBQWEsQ0FBQyxPQUFPLENBQUMsZUFBZSxRQUFRLGFBQWEsQ0FBQyxDQUFDO1lBRTVELHNFQUFzRTtZQUV0RSxPQUFPO1lBQ1AsTUFBTSxhQUFhLEdBQUcsSUFBSSxDQUFDLCtCQUErQixDQUFDLENBQUM7WUFFNUQsWUFBWTtZQUNaLE1BQU0sTUFBTSxDQUFDLEdBQUcsQ0FBQyxNQUFNLFVBQVUsNkVBQTZFLENBQUMsQ0FBQztZQUVoSCxrQkFBa0I7WUFDbEIsSUFBSSxVQUFVLENBQUMsV0FBVyxDQUFDLEtBQUssVUFBVSxlQUFlLENBQUMsRUFBRSxDQUFDO2dCQUMzRCwrQkFBK0I7Z0JBQy9CLFVBQVUsQ0FBQyxNQUFNLENBQUMsR0FBRyxVQUFVLG9CQUFvQixDQUFDLENBQUM7Z0JBRXJELDJCQUEyQjtnQkFDM0IsVUFBVSxDQUFDLEtBQUssQ0FBQyxLQUFLLFVBQVUsNkJBQTZCLEVBQUU7b0JBQzdELFdBQVcsRUFBRSxXQUFXLElBQUksTUFBTTtvQkFDbEMsSUFBSSxFQUFFLEdBQUcsSUFBSSxhQUFhO29CQUMxQixPQUFPLEVBQUUsT0FBTztpQkFDakIsQ0FBQyxDQUFDO2dCQUVILDBEQUEwRDtnQkFDMUQsTUFBTSxrQkFBUSxDQUFDLE1BQU0sQ0FBQyxLQUFLLFVBQVUsaUNBQWlDLEVBQUUsT0FBTyxDQUFDLEVBQUUsQ0FBQyxNQUFNLENBQUMsMEJBQTBCLENBQUMsT0FBTyxDQUFDLENBQUMsT0FBTyxDQUFDLGVBQWUsRUFBRSxHQUFHLFVBQzFKLEdBQUcsQ0FBQyxDQUFDLENBQUM7Z0JBRU4sOEJBQThCO2dCQUM5QixJQUFJLFFBQVEsRUFBRSxDQUFDO29CQUNiLGlCQUFpQjtvQkFDakIsTUFBTSxNQUFNLENBQUMsR0FBRyxDQUNkLE1BQU0sVUFBVSxvRkFBb0YsQ0FDckcsQ0FBQztnQkFDSixDQUFDO2dCQUVELE9BQU87Z0JBQ1AsYUFBYSxDQUFDLE9BQU8sQ0FBQyxnQ0FBZ0MsQ0FBQyxDQUFDO1lBQzFELENBQUM7aUJBQU0sQ0FBQztnQkFDTixhQUFhLENBQUMsSUFBSSxDQUFDLG9DQUFvQyxDQUFDLENBQUM7WUFDM0QsQ0FBQztZQUVELHVCQUF1QjtZQUN2QixNQUFNLGNBQWMsR0FBRyxJQUFJLENBQUMsc0JBQXNCLENBQUMsQ0FBQztZQUNwRCxNQUFNLE1BQU0sQ0FBQyxHQUFHLENBQUMsTUFBTSxVQUFVLDJCQUEyQixDQUFDLENBQUM7WUFDOUQsY0FBYyxDQUFDLE9BQU8sQ0FBQyxvQ0FBb0MsQ0FBQyxDQUFDO1lBRTdELHNDQUFzQztZQUN0QyxJQUFJLENBQUMsRUFBRSxDQUFDLENBQUM7WUFDVCxPQUFPLENBQ0wsc0NBQXNDLFFBQVEsT0FBTyxVQUFVLFNBQVMsSUFBSSxXQUFXLE1BQU0sQ0FBQyxxQkFBcUIsQ0FDakgsS0FBSyxFQUFFLENBQ1IsSUFBSSxDQUNOLENBQUM7WUFDRixJQUFJLENBQUMsRUFBRSxDQUFDLENBQUM7WUFDVCxJQUFJLENBQUMsT0FBTyxDQUFDLENBQUM7WUFDZCxJQUFJLENBQUMsU0FBUyxJQUFJLEVBQUUsQ0FBQyxDQUFDO1lBQ3RCLElBQUksQ0FBQyxVQUFVLFVBQVUsRUFBRSxDQUFDLENBQUM7WUFDN0IsSUFBSSxDQUFDLG1CQUFtQixDQUFDLENBQUM7WUFDMUIsSUFBSSxDQUFDLEVBQUUsQ0FBQyxDQUFDO1lBRVQsSUFBSSxDQUFDLE9BQU8sQ0FBQyxVQUFVLENBQUMsT0FBTyxDQUFDLGVBQWUsRUFBRSxDQUFDO2dCQUNoRCxPQUFPLENBQUMsSUFBSSxFQUFFLENBQUM7WUFDakIsQ0FBQztZQUVELFlBQVk7WUFDWixPQUFPLGlCQUFpQixVQUFVLFNBQVMsSUFBSSxFQUFFLENBQUM7UUFDcEQsQ0FBQztJQUNILENBQUMsQ0FBQTtDQUNGLENBQUM7QUFFRixrQkFBZSxVQUFVLENBQUMifQ==
|
|
@@ -18,12 +18,13 @@ const object_1 = require("./object");
|
|
|
18
18
|
*/
|
|
19
19
|
const NewCommand = {
|
|
20
20
|
alias: ['ap'],
|
|
21
|
-
description: 'Adds a property to a module',
|
|
21
|
+
description: 'Adds a property to a module. Use --type (Module|Object), --element <name>, --prop-name-X <name>, --prop-type-X <type>, --prop-nullable-X (true|false), --prop-array-X (true|false), --prop-enum-X <EnumName>, --prop-schema-X <SchemaName>, --prop-reference-X <ReferenceName> for non-interactive mode.',
|
|
22
22
|
hidden: false,
|
|
23
23
|
name: 'addProp',
|
|
24
24
|
run: (toolbox) => __awaiter(void 0, void 0, void 0, function* () {
|
|
25
25
|
// Retrieve the tools we need
|
|
26
26
|
const { filesystem, print: { divider, error, info, spin, success }, prompt: { ask, confirm }, server, strings: { pascalCase }, system, } = toolbox;
|
|
27
|
+
const argProps = Object.keys(toolbox.parameters.options || {}).filter((key) => key.startsWith('prop'));
|
|
27
28
|
const declare = server.useDefineForClassFieldsActivated();
|
|
28
29
|
function getModules() {
|
|
29
30
|
const cwd = filesystem.cwd();
|
|
@@ -37,7 +38,9 @@ const NewCommand = {
|
|
|
37
38
|
const objectDirs = (0, path_1.join)(path, 'src', 'server', 'common', 'objects');
|
|
38
39
|
return filesystem.subdirectories(objectDirs, true);
|
|
39
40
|
}
|
|
40
|
-
|
|
41
|
+
// Parse CLI arguments
|
|
42
|
+
const { element: cliElement, type: cliType } = toolbox.parameters.options;
|
|
43
|
+
const objectOrModule = cliType || (yield ask([
|
|
41
44
|
{
|
|
42
45
|
choices: ['Module', 'Object'],
|
|
43
46
|
message: 'What should be updated',
|
|
@@ -45,7 +48,7 @@ const NewCommand = {
|
|
|
45
48
|
type: 'select',
|
|
46
49
|
},
|
|
47
50
|
])).input;
|
|
48
|
-
const elementToEdit = (yield ask([
|
|
51
|
+
const elementToEdit = cliElement || (yield ask([
|
|
49
52
|
{
|
|
50
53
|
choices: objectOrModule === 'Module' ? getModules() : getObjects(),
|
|
51
54
|
message: 'Choose one to update',
|
|
@@ -61,7 +64,13 @@ const NewCommand = {
|
|
|
61
64
|
error(`No src directory in "${path}".`);
|
|
62
65
|
return undefined;
|
|
63
66
|
}
|
|
64
|
-
const { objectsToAdd, props, referencesToAdd, refsSet, schemaSet } = yield
|
|
67
|
+
const { objectsToAdd, props, referencesToAdd, refsSet, schemaSet } = yield toolbox.parseProperties({
|
|
68
|
+
argProps,
|
|
69
|
+
objectsToAdd: [],
|
|
70
|
+
parameters: toolbox.parameters,
|
|
71
|
+
referencesToAdd: [],
|
|
72
|
+
server: toolbox.server,
|
|
73
|
+
});
|
|
65
74
|
const updateSpinner = spin('Updating files...');
|
|
66
75
|
const project = new ts_morph_1.Project();
|
|
67
76
|
// Prepare model file
|
|
@@ -149,25 +158,36 @@ const NewCommand = {
|
|
|
149
158
|
name: propObj.name,
|
|
150
159
|
};
|
|
151
160
|
// Patch model
|
|
152
|
-
const lastModelProperty = modelProperties[modelProperties.length - 1];
|
|
153
161
|
const newModelProperty = structuredClone(standardDeclaration);
|
|
154
162
|
newModelProperty.decorators.push({ arguments: [`${propObj.type === 'ObjectId' || propObj.schema ? `{ ref: () => ${propObj.reference}, type: Schema.Types.ObjectId }` : ''}`], name: 'Prop' });
|
|
155
163
|
newModelProperty.decorators.push({ arguments: [constructUnifiedFieldOptions('model')], name: 'UnifiedField' });
|
|
156
164
|
newModelProperty.type = `${typeString()}${propObj.isArray ? '[]' : ''}`;
|
|
157
|
-
|
|
165
|
+
let insertedModelProp;
|
|
166
|
+
if (modelProperties.length > 0) {
|
|
167
|
+
const lastModelProperty = modelProperties[modelProperties.length - 1];
|
|
168
|
+
insertedModelProp = modelDeclaration.insertProperty(lastModelProperty.getChildIndex() + 1, newModelProperty);
|
|
169
|
+
}
|
|
170
|
+
else {
|
|
171
|
+
insertedModelProp = modelDeclaration.addProperty(newModelProperty);
|
|
172
|
+
}
|
|
158
173
|
insertedModelProp.prependWhitespace('\n');
|
|
159
174
|
insertedModelProp.appendWhitespace('\n');
|
|
160
175
|
// Patch input
|
|
161
|
-
const lastInputProperty = inputProperties[inputProperties.length - 1];
|
|
162
176
|
const newInputProperty = structuredClone(standardDeclaration);
|
|
163
177
|
newInputProperty.decorators.push({ arguments: [constructUnifiedFieldOptions('input')], name: 'UnifiedField' });
|
|
164
178
|
const inputSuffix = propObj.type === 'ObjectId' || propObj.schema ? 'Input' : '';
|
|
165
179
|
newInputProperty.type = `${typeString()}${inputSuffix}${propObj.isArray ? '[]' : ''}`;
|
|
166
|
-
|
|
180
|
+
let insertedInputProp;
|
|
181
|
+
if (inputProperties.length > 0) {
|
|
182
|
+
const lastInputProperty = inputProperties[inputProperties.length - 1];
|
|
183
|
+
insertedInputProp = inputDeclaration.insertProperty(lastInputProperty.getChildIndex() + 1, newInputProperty);
|
|
184
|
+
}
|
|
185
|
+
else {
|
|
186
|
+
insertedInputProp = inputDeclaration.addProperty(newInputProperty);
|
|
187
|
+
}
|
|
167
188
|
insertedInputProp.prependWhitespace('\n');
|
|
168
189
|
insertedInputProp.appendWhitespace('\n');
|
|
169
190
|
// Patch create input
|
|
170
|
-
const lastCreateInputProperty = createInputProperties[createInputProperties.length - 1];
|
|
171
191
|
const newCreateInputProperty = structuredClone(standardDeclaration);
|
|
172
192
|
if (declare) {
|
|
173
193
|
newCreateInputProperty.hasDeclareKeyword = true;
|
|
@@ -178,7 +198,14 @@ const NewCommand = {
|
|
|
178
198
|
newCreateInputProperty.decorators.push({ arguments: [constructUnifiedFieldOptions('create')], name: 'UnifiedField' });
|
|
179
199
|
const createSuffix = propObj.type === 'ObjectId' || propObj.schema ? 'CreateInput' : '';
|
|
180
200
|
newCreateInputProperty.type = `${typeString()}${createSuffix}${propObj.isArray ? '[]' : ''}`;
|
|
181
|
-
|
|
201
|
+
let insertedCreateInputProp;
|
|
202
|
+
if (createInputProperties.length > 0) {
|
|
203
|
+
const lastCreateInputProperty = createInputProperties[createInputProperties.length - 1];
|
|
204
|
+
insertedCreateInputProp = createInputDeclaration.insertProperty(lastCreateInputProperty.getChildIndex() + 1, newCreateInputProperty);
|
|
205
|
+
}
|
|
206
|
+
else {
|
|
207
|
+
insertedCreateInputProp = createInputDeclaration.addProperty(newCreateInputProperty);
|
|
208
|
+
}
|
|
182
209
|
insertedCreateInputProp.prependWhitespace('\n');
|
|
183
210
|
insertedCreateInputProp.appendWhitespace('\n');
|
|
184
211
|
}
|
|
@@ -220,4 +247,4 @@ const NewCommand = {
|
|
|
220
247
|
}),
|
|
221
248
|
};
|
|
222
249
|
exports.default = NewCommand;
|
|
223
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"add-property.js","sourceRoot":"","sources":["../../../src/commands/server/add-property.ts"],"names":[],"mappings":";;;;;;;;;;;AACA,+BAA4B;AAC5B,uCAMkB;AAGlB,qCAAiC;AACjC,qCAAiC;AAEjC;;GAEG;AACH,MAAM,UAAU,GAAmB;IACjC,KAAK,EAAE,CAAC,IAAI,CAAC;IACb,WAAW,EAAE,6BAA6B;IAC1C,MAAM,EAAE,KAAK;IACb,IAAI,EAAE,SAAS;IACf,GAAG,EAAE,CAAO,OAA+B,EAAE,EAAE;QAC7C,6BAA6B;QAC7B,MAAM,EACJ,UAAU,EACV,KAAK,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,EAC9C,MAAM,EAAE,EAAE,GAAG,EAAE,OAAO,EAAE,EACxB,MAAM,EACN,OAAO,EAAE,EAAE,UAAU,EAAE,EACvB,MAAM,GACP,GAAG,OAAO,CAAC;QAEZ,MAAM,OAAO,GAAG,MAAM,CAAC,gCAAgC,EAAE,CAAC;QAE1D,SAAS,UAAU;YACjB,MAAM,GAAG,GAAG,UAAU,CAAC,GAAG,EAAE,CAAC;YAC7B,MAAM,IAAI,GAAG,GAAG,CAAC,MAAM,CAAC,CAAC,EAAE,GAAG,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC;YACnD,MAAM,UAAU,GAAG,IAAA,WAAI,EAAC,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;YAE1D,OAAO,UAAU,CAAC,cAAc,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;QACrD,CAAC;QAED,SAAS,UAAU;YACjB,MAAM,GAAG,GAAG,UAAU,CAAC,GAAG,EAAE,CAAC;YAC7B,MAAM,IAAI,GAAG,GAAG,CAAC,MAAM,CAAC,CAAC,EAAE,GAAG,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC;YACnD,MAAM,UAAU,GAAG,IAAA,WAAI,EAAC,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;YAEpE,OAAO,UAAU,CAAC,cAAc,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;QACrD,CAAC;QAED,MAAM,cAAc,GAAG,CACrB,MAAM,GAAG,CAAC;YACR;gBACE,OAAO,EAAE,CAAC,QAAQ,EAAE,QAAQ,CAAC;gBAC7B,OAAO,EAAE,wBAAwB;gBACjC,IAAI,EAAE,OAAO;gBACb,IAAI,EAAE,QAAQ;aACf;SACF,CAAC,CACH,CAAC,KAAK,CAAC;QAGR,MAAM,aAAa,GAAG,CACpB,MAAM,GAAG,CAAC;YACR;gBACE,OAAO,EAAE,cAAc,KAAK,QAAQ,CAAC,CAAC,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,UAAU,EAAE;gBAClE,OAAO,EAAE,sBAAsB;gBAC/B,IAAI,EAAE,OAAO;gBACb,IAAI,EAAE,QAAQ;aACf;SACF,CAAC,CACH,CAAC,KAAK,CAAC;QAGR,qBAAqB;QACrB,MAAM,GAAG,GAAG,UAAU,CAAC,GAAG,EAAE,CAAC;QAC7B,MAAM,IAAI,GAAG,GAAG,CAAC,MAAM,CAAC,CAAC,EAAE,GAAG,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC;QACnD,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,IAAA,WAAI,EAAC,IAAI,EAAE,KAAK,CAAC,CAAC,EAAE,CAAC;YAC1C,IAAI,CAAC,EAAE,CAAC,CAAC;YACT,KAAK,CAAC,wBAAwB,IAAI,IAAI,CAAC,CAAC;YACxC,OAAO,SAAS,CAAC;QACnB,CAAC;QAED,MAAM,EAAE,YAAY,EAAE,KAAK,EAAE,eAAe,EAAE,OAAO,EAAE,SAAS,EAAE,GAAG,MAAM,MAAM,CAAC,aAAa,EAAE,CAAC;QAElG,MAAM,aAAa,GAAG,IAAI,CAAC,mBAAmB,CAAC,CAAC;QAEhD,MAAM,OAAO,GAAG,IAAI,kBAAO,EAAE,CAAC;QAE9B,qBAAqB;QACrB,MAAM,SAAS,GAAG,cAAc,KAAK,QAAQ;YAC3C,CAAC,CAAC,IAAA,WAAI,EAAC,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,SAAS,EAAE,aAAa,EAAE,GAAG,aAAa,WAAW,CAAC;YACpF,CAAC,CAAC,IAAA,WAAI,EAAC,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,SAAS,EAAE,aAAa,EAAE,GAAG,aAAa,YAAY,CAAC,CAAC;QAClG,MAAM,UAAU,GAAG,OAAO,CAAC,mBAAmB,CAAC,SAAS,CAAC,CAAC;QAC1D,MAAM,gBAAgB,GAAG,UAAU,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,CAAC;QACpD,MAAM,eAAe,GAAG,gBAAgB,CAAC,UAAU,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,EAAE,KAAK,qBAAU,CAAC,mBAAmB,CAAyB,CAAC;QAE1I,qBAAqB;QACrB,MAAM,SAAS,GAAG,cAAc,KAAK,QAAQ;YAC3C,CAAC,CAAC,IAAA,WAAI,EAAC,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,SAAS,EAAE,aAAa,EAAE,QAAQ,EAAE,GAAG,aAAa,WAAW,CAAC;YAC9F,CAAC,CAAC,IAAA,WAAI,EAAC,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,SAAS,EAAE,aAAa,EAAE,GAAG,aAAa,WAAW,CAAC,CAAC;QACjG,MAAM,SAAS,GAAG,OAAO,CAAC,mBAAmB,CAAC,SAAS,CAAC,CAAC;QACzD,MAAM,gBAAgB,GAAG,SAAS,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,CAAC;QACnD,MAAM,eAAe,GAAG,gBAAgB,CAAC,UAAU,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,EAAE,KAAK,qBAAU,CAAC,mBAAmB,CAAyB,CAAC;QAE1I,4BAA4B;QAC5B,MAAM,cAAc,GAAG,cAAc,KAAK,QAAQ;YAChD,CAAC,CAAC,IAAA,WAAI,EAAC,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,SAAS,EAAE,aAAa,EAAE,QAAQ,EAAE,GAAG,aAAa,kBAAkB,CAAC;YACrG,CAAC,CAAC,IAAA,WAAI,EAAC,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,SAAS,EAAE,aAAa,EAAE,GAAG,aAAa,kBAAkB,CAAC,CAAC;QACxG,MAAM,eAAe,GAAG,OAAO,CAAC,mBAAmB,CAAC,cAAc,CAAC,CAAC;QACpE,MAAM,sBAAsB,GAAG,eAAe,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,CAAC;QAC/D,MAAM,qBAAqB,GAAG,sBAAsB,CAAC,UAAU,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,EAAE,KAAK,qBAAU,CAAC,mBAAmB,CAAC,CAAC;QAE9H,YAAY;QACZ,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC;YAEhD,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC;YAE5B,IAAI,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,EAAE,KAAK,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;gBAC5D,IAAI,CAAC,EAAE,CAAC,CAAC;gBACT,IAAI,CAAC,YAAY,OAAO,CAAC,IAAI,iBAAiB,CAAC,CAAC;gBAEhD,uDAAuD;gBACvD,MAAM,QAAQ,GAAG,eAAe,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;gBACnF,IAAI,QAAQ,KAAK,CAAC,CAAC,EAAE,CAAC;oBACpB,eAAe,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;gBACtC,CAAC;gBAED,oDAAoD;gBACpD,MAAM,QAAQ,GAAG,YAAY,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;gBAChF,IAAI,QAAQ,KAAK,CAAC,CAAC,EAAE,CAAC;oBACpB,YAAY,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;gBACnC,CAAC;gBAED,QAAQ;gBACR,SAAS;YACX,CAAC;YAED,MAAM,IAAI,GAAG,CAAC,KAAK,EAAE,QAAQ,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;YAE1L,MAAM,WAAW,GAAG,IAAI,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,UAAU,CAAC,aAAa,CAAC,GAAG,CAAC;YAEpF,MAAM,UAAU,GAAG,GAAG,EAAE;gBACtB,QAAQ,IAAI,EAAE,CAAC;oBACb,KAAK,IAAI,KAAK,MAAM;wBAClB,OAAO,MAAM,CAAC;oBAEhB,KAAK,CAAC,CAAC,OAAO,CAAC,OAAO;wBACpB,OAAO,OAAO,CAAC,OAAO,CAAC;oBAEzB,KAAK,CAAC,CAAC,OAAO,CAAC,MAAM;wBACnB,OAAO,OAAO,CAAC,MAAM,CAAC;oBAExB,KAAK,OAAO,CAAC,IAAI,KAAK,UAAU;wBAC9B,OAAO,OAAO,CAAC,SAAS,CAAC;oBAE3B;wBACE,OAAO,UAAU,CAAC,IAAI,CAAC,CAAC;gBAC5B,CAAC;YACH,CAAC,CAAC;YAEF,8EAA8E;YAC9E,SAAS,4BAA4B,CAAC,IAAkC;gBACtE,QAAQ,IAAI,EAAE,CAAC;oBACb,KAAK,QAAQ;wBACX,OAAO;6BACU,WAAW,IAAI,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,EAAE;sCACnD,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,iBAAiB,UAAU,EAAE,GAAG,OAAO,CAAC,IAAI,KAAK,UAAU,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,EAAE;gBACjJ,CAAC;oBACP,KAAK,OAAO;wBACV,OAAO;6BACU,WAAW;;;gBAGxB,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,iBAAiB,OAAO,CAAC,OAAO,IAAI,CAAC,CAAC,CAAC,eAAe,UAAU,EAAE,GAAG,OAAO,CAAC,IAAI,KAAK,UAAU,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;gBACrJ,CAAC;oBACP,KAAK,OAAO;wBACV,OAAO;6BACU,WAAW,IAAI,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,EAAE;sCACnD,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,iBAAiB,UAAU,EAAE,EAAE;gBAC5E,CAAC;gBACT,CAAC;YACH,CAAC;YAED,MAAM,mBAAmB,GAA+C;gBACtE,UAAU,EAAE,EAAE;gBACd,gBAAgB,EAAE,OAAO,CAAC,QAAQ;gBAClC,WAAW,EAAE,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,WAAW;gBAC9C,IAAI,EAAE,OAAO,CAAC,IAAI;aACnB,CAAC;YAEF,cAAc;YACd,MAAM,iBAAiB,GAAG,eAAe,CAAC,eAAe,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;YACtE,MAAM,gBAAgB,GAA+C,eAAe,CAAC,mBAAmB,CAAC,CAAC;YAC1G,gBAAgB,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,CAAC,GAAG,OAAO,CAAC,IAAI,KAAK,UAAU,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,gBAAgB,OAAO,CAAC,SAAS,iCAAiC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC;YAC9L,gBAAgB,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,CAAC,4BAA4B,CAAC,OAAO,CAAC,CAAC,EAAE,IAAI,EAAE,cAAc,EAAE,CAAC,CAAC;YAC/G,gBAAgB,CAAC,IAAI,GAAG,GAAG,UAAU,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;YACxE,MAAM,iBAAiB,GAAG,gBAAgB,CAAC,cAAc,CAAC,iBAAiB,CAAC,aAAa,EAAE,GAAG,CAAC,EAAE,gBAAgB,CAAC,CAAC;YACnH,iBAAiB,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;YAC1C,iBAAiB,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC;YAEzC,cAAc;YACd,MAAM,iBAAiB,GAAG,eAAe,CAAC,eAAe,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;YACtE,MAAM,gBAAgB,GAA+C,eAAe,CAAC,mBAAmB,CAAC,CAAC;YAC1G,gBAAgB,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,CAAC,4BAA4B,CAAC,OAAO,CAAC,CAAC,EAAE,IAAI,EAAE,cAAc,EAAE,CAAC,CAAC;YAC/G,MAAM,WAAW,GAAG,OAAO,CAAC,IAAI,KAAK,UAAU,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;YACjF,gBAAgB,CAAC,IAAI,GAAG,GAAG,UAAU,EAAE,GAAG,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;YACtF,MAAM,iBAAiB,GAAG,gBAAgB,CAAC,cAAc,CAAC,iBAAiB,CAAC,aAAa,EAAE,GAAG,CAAC,EAAE,gBAAgB,CAAC,CAAC;YACnH,iBAAiB,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;YAC1C,iBAAiB,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC;YAEzC,qBAAqB;YACrB,MAAM,uBAAuB,GAAG,qBAAqB,CAAC,qBAAqB,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;YACxF,MAAM,sBAAsB,GAA+C,eAAe,CAAC,mBAAmB,CAAC,CAAC;YAChH,IAAI,OAAO,EAAE,CAAC;gBACZ,sBAAsB,CAAC,iBAAiB,GAAG,IAAI,CAAC;YAClD,CAAC;iBAAM,CAAC;gBACN,sBAAsB,CAAC,kBAAkB,GAAG,IAAI,CAAC;YACnD,CAAC;YACD,sBAAsB,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,CAAC,4BAA4B,CAAC,QAAQ,CAAC,CAAC,EAAE,IAAI,EAAE,cAAc,EAAE,CAAC,CAAC;YACtH,MAAM,YAAY,GAAG,OAAO,CAAC,IAAI,KAAK,UAAU,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,CAAC;YACxF,sBAAsB,CAAC,IAAI,GAAG,GAAG,UAAU,EAAE,GAAG,YAAY,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;YAC7F,MAAM,uBAAuB,GAAG,sBAAsB,CAAC,cAAc,CAAC,uBAAuB,CAAC,aAAa,EAAE,GAAG,CAAC,EAAE,sBAAsB,CAAC,CAAC;YAC3I,uBAAuB,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;YAChD,uBAAuB,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC;QACjD,CAAC;QAED,OAAO,CAAC,oBAAoB,CAAC,GAAG,CAAC;YAC/B,eAAe,EAAE,0BAAe,CAAC,SAAS;SAC3C,CAAC,CAAC;QAEH,eAAe;QACf,UAAU,CAAC,UAAU,EAAE,CAAC;QACxB,SAAS,CAAC,UAAU,EAAE,CAAC;QACvB,eAAe,CAAC,UAAU,EAAE,CAAC;QAE7B,aAAa;QACb,MAAM,UAAU,CAAC,IAAI,EAAE,CAAC;QACxB,MAAM,SAAS,CAAC,IAAI,EAAE,CAAC;QACvB,MAAM,eAAe,CAAC,IAAI,EAAE,CAAC;QAE7B,aAAa,CAAC,OAAO,CAAC,iCAAiC,CAAC,CAAC;QAEzD,4BAA4B;QAC5B,IAAI,eAAe,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC/B,OAAO,EAAE,CAAC;YACV,MAAM,OAAO,GAAG,eAAe,CAAC,KAAK,EAAE,CAAC,SAAS,CAAC;YAClD,MAAM,gBAAS,CAAC,GAAG,CAAC,OAAO,EAAE,EAAE,WAAW,EAAE,OAAO,EAAE,YAAY,EAAE,kBAAkB,EAAE,IAAI,EAAE,eAAe,EAAE,CAAC,CAAC;QAClH,CAAC;QAED,yBAAyB;QACzB,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC5B,OAAO,EAAE,CAAC;YACV,MAAM,OAAO,GAAG,YAAY,CAAC,KAAK,EAAE,CAAC,MAAM,CAAC;YAC5C,MAAM,gBAAS,CAAC,GAAG,CAAC,OAAO,EAAE,EAAE,WAAW,EAAE,OAAO,EAAE,YAAY,EAAE,kBAAkB,EAAE,IAAI,EAAE,eAAe,EAAE,CAAC,CAAC;QAClH,CAAC;QAED,WAAW;QACX,IAAI,MAAM,OAAO,CAAC,eAAe,EAAE,IAAI,CAAC,EAAE,CAAC;YACzC,MAAM,MAAM,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC;QACvC,CAAC;QAED,IAAI,OAAO,IAAI,SAAS,EAAE,CAAC;YACzB,OAAO,CAAC,mGAAmG,CAAC,CAAC;QAC/G,CAAC;QAED,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,eAAe,EAAE,CAAC;YAChD,OAAO,CAAC,IAAI,EAAE,CAAC;QACjB,CAAC;QAED,OAAO,0BAA0B,aAAa,EAAE,CAAC;IACnD,CAAC,CAAA;CACF,CAAC;AAEF,kBAAe,UAAU,CAAC"}
|
|
250
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"add-property.js","sourceRoot":"","sources":["../../../src/commands/server/add-property.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,12 +16,13 @@ const object_1 = require("./object");
|
|
|
16
16
|
*/
|
|
17
17
|
const NewCommand = {
|
|
18
18
|
alias: ['m'],
|
|
19
|
-
description: 'Creates a new server module',
|
|
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.',
|
|
20
20
|
hidden: false,
|
|
21
21
|
name: 'module',
|
|
22
22
|
run: (toolbox, options) => __awaiter(void 0, void 0, void 0, function* () {
|
|
23
23
|
// Options:
|
|
24
|
-
const { currentItem,
|
|
24
|
+
const { currentItem, preventExitProcess } = Object.assign({ currentItem: '', preventExitProcess: false }, options);
|
|
25
|
+
let { objectsToAdd = [], referencesToAdd = [] } = options || {};
|
|
25
26
|
// Retrieve the tools we need
|
|
26
27
|
const { filesystem, helper, parameters, patching, print: { divider, error, info, spin, success }, prompt: { ask, confirm }, server, strings: { camelCase, kebabCase, pascalCase }, system, template, } = toolbox;
|
|
27
28
|
// Start timer
|
|
@@ -33,14 +34,19 @@ const NewCommand = {
|
|
|
33
34
|
else {
|
|
34
35
|
info('Create a new server module');
|
|
35
36
|
}
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
37
|
+
// Parse CLI arguments
|
|
38
|
+
const { controller: cliController, name: cliName, skipLint: cliSkipLint } = parameters.options;
|
|
39
|
+
let name = cliName || currentItem || parameters.first;
|
|
40
|
+
if (!name) {
|
|
41
|
+
name = yield helper.getInput(currentItem || parameters.first, {
|
|
42
|
+
initial: currentItem || '',
|
|
43
|
+
name: 'module name',
|
|
44
|
+
});
|
|
45
|
+
}
|
|
40
46
|
if (!name) {
|
|
41
47
|
return;
|
|
42
48
|
}
|
|
43
|
-
const controller = (yield ask({
|
|
49
|
+
const controller = cliController || (yield ask({
|
|
44
50
|
choices: ['Rest', 'GraphQL', 'Both'],
|
|
45
51
|
message: 'What controller type?',
|
|
46
52
|
name: 'controller',
|
|
@@ -64,7 +70,9 @@ const NewCommand = {
|
|
|
64
70
|
error(`Module directory "${directory}" already exists.`);
|
|
65
71
|
return undefined;
|
|
66
72
|
}
|
|
67
|
-
const { props, refsSet, schemaSet } = yield
|
|
73
|
+
const { objectsToAdd: newObjects, props, referencesToAdd: newReferences, refsSet, schemaSet } = yield toolbox.parseProperties({ objectsToAdd, referencesToAdd });
|
|
74
|
+
objectsToAdd = newObjects;
|
|
75
|
+
referencesToAdd = newReferences;
|
|
68
76
|
const generateSpinner = spin('Generate files');
|
|
69
77
|
const declare = server.useDefineForClassFieldsActivated();
|
|
70
78
|
const inputTemplate = server.propsForInput(props, { declare, modelName: name, nullable: true });
|
|
@@ -181,8 +189,10 @@ const NewCommand = {
|
|
|
181
189
|
yield object_1.default.run(toolbox, { currentItem: nextObj, objectsToAdd, preventExitProcess: true, referencesToAdd });
|
|
182
190
|
}
|
|
183
191
|
// Lint fix
|
|
184
|
-
if (
|
|
185
|
-
yield
|
|
192
|
+
if (!cliSkipLint) {
|
|
193
|
+
if (yield confirm('Run lint fix?', true)) {
|
|
194
|
+
yield system.run('npm run lint:fix');
|
|
195
|
+
}
|
|
186
196
|
}
|
|
187
197
|
divider();
|
|
188
198
|
// We're done, so show what to do next
|
|
@@ -199,4 +209,4 @@ const NewCommand = {
|
|
|
199
209
|
}),
|
|
200
210
|
};
|
|
201
211
|
exports.default = NewCommand;
|
|
202
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
212
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"module.js","sourceRoot":"","sources":["../../../src/commands/server/module.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,7 +16,7 @@ const module_1 = require("./module");
|
|
|
16
16
|
*/
|
|
17
17
|
const NewCommand = {
|
|
18
18
|
alias: ['o'],
|
|
19
|
-
description: 'Creates a new server object (with inputs)',
|
|
19
|
+
description: 'Creates a new server object (with inputs). Use --name <ObjectName> and property flags --prop-name-X, --prop-type-X, etc. for non-interactive mode.',
|
|
20
20
|
hidden: false,
|
|
21
21
|
name: 'object',
|
|
22
22
|
run: (toolbox, options) => __awaiter(void 0, void 0, void 0, function* () {
|
|
@@ -33,11 +33,16 @@ const NewCommand = {
|
|
|
33
33
|
else {
|
|
34
34
|
info('Create a new server object (with inputs)');
|
|
35
35
|
}
|
|
36
|
+
// Parse CLI arguments
|
|
37
|
+
const { name: cliName, skipLint: cliSkipLint } = parameters.options;
|
|
36
38
|
// Get name
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
name
|
|
40
|
-
|
|
39
|
+
let name = cliName || currentItem || parameters.first;
|
|
40
|
+
if (!name) {
|
|
41
|
+
name = yield helper.getInput(currentItem || parameters.first, {
|
|
42
|
+
initial: currentItem || '',
|
|
43
|
+
name: 'object name',
|
|
44
|
+
});
|
|
45
|
+
}
|
|
41
46
|
if (!name) {
|
|
42
47
|
return;
|
|
43
48
|
}
|
|
@@ -59,7 +64,8 @@ const NewCommand = {
|
|
|
59
64
|
error(`Module directory "${directory}" already exists.`);
|
|
60
65
|
return undefined;
|
|
61
66
|
}
|
|
62
|
-
|
|
67
|
+
// Parse properties from CLI or interactive mode
|
|
68
|
+
const { props, refsSet, schemaSet } = yield toolbox.parseProperties({ objectsToAdd, referencesToAdd });
|
|
63
69
|
const generateSpinner = spin('Generate files');
|
|
64
70
|
const declare = server.useDefineForClassFieldsActivated();
|
|
65
71
|
const inputTemplate = server.propsForInput(props, { declare, modelName: name, nullable: true });
|
|
@@ -92,8 +98,10 @@ const NewCommand = {
|
|
|
92
98
|
});
|
|
93
99
|
generateSpinner.succeed('Files generated');
|
|
94
100
|
// Lint fix
|
|
95
|
-
if (
|
|
96
|
-
yield
|
|
101
|
+
if (!cliSkipLint) {
|
|
102
|
+
if (yield confirm('Run lint fix?', true)) {
|
|
103
|
+
yield system.run('npm run lint:fix');
|
|
104
|
+
}
|
|
97
105
|
}
|
|
98
106
|
// We're done, so show what to do next
|
|
99
107
|
info('');
|
|
@@ -125,4 +133,4 @@ const NewCommand = {
|
|
|
125
133
|
}),
|
|
126
134
|
};
|
|
127
135
|
exports.default = NewCommand;
|
|
128
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
136
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoib2JqZWN0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2NvbW1hbmRzL3NlcnZlci9vYmplY3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7QUFBQSwrQkFBNEI7QUFJNUIscUNBQWlDO0FBRWpDOztHQUVHO0FBQ0gsTUFBTSxVQUFVLEdBQTJCO0lBQ3pDLEtBQUssRUFBRSxDQUFDLEdBQUcsQ0FBQztJQUNaLFdBQVcsRUFBRSxvSkFBb0o7SUFDakssTUFBTSxFQUFFLEtBQUs7SUFDYixJQUFJLEVBQUUsUUFBUTtJQUNkLEdBQUcsRUFBRSxDQUNILE9BQStCLEVBQy9CLE9BS0MsRUFDRCxFQUFFO1FBRUYsV0FBVztRQUNYLE1BQU0sRUFBRSxXQUFXLEVBQUUsWUFBWSxFQUFFLGtCQUFrQixFQUFFLGVBQWUsRUFBRSxtQkFDdEUsV0FBVyxFQUFFLEVBQUUsRUFDZixZQUFZLEVBQUUsRUFBRSxFQUNoQixrQkFBa0IsRUFBRSxLQUFLLEVBQ3pCLGVBQWUsRUFBRSxFQUFFLElBQ2hCLE9BQU8sQ0FDWCxDQUFDO1FBRUYsNkJBQTZCO1FBQzdCLE1BQU0sRUFDSixVQUFVLEVBQ1YsTUFBTSxFQUNOLFVBQVUsRUFDVixLQUFLLEVBQUUsRUFBRSxPQUFPLEVBQUUsS0FBSyxFQUFFLElBQUksRUFBRSxJQUFJLEVBQUUsT0FBTyxFQUFFLEVBQzlDLE1BQU0sRUFBRSxFQUFFLE9BQU8sRUFBRSxFQUNuQixNQUFNLEVBQ04sT0FBTyxFQUFFLEVBQUUsU0FBUyxFQUFFLFNBQVMsRUFBRSxVQUFVLEVBQUUsRUFDN0MsTUFBTSxFQUNOLFFBQVEsR0FDVCxHQUFHLE9BQU8sQ0FBQztRQUVaLGNBQWM7UUFDZCxNQUFNLEtBQUssR0FBRyxNQUFNLENBQUMsVUFBVSxFQUFFLENBQUM7UUFFbEMsT0FBTztRQUNQLElBQUksV0FBVyxFQUFFLENBQUM7WUFDaEIsSUFBSSxDQUFDLGdEQUFnRCxXQUFXLEVBQUUsQ0FBQyxDQUFDO1FB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
|