@lenne.tech/cli 0.0.82 → 0.0.85
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/angular/create.js +86 -45
- package/build/commands/deployment/create.js +91 -9
- package/build/commands/git/get.js +8 -2
- package/build/commands/server/create.js +2 -1
- package/build/commands/server/module.js +16 -4
- package/build/commands/server/object.js +163 -0
- package/build/extensions/server.js +55 -14
- package/build/extensions/tools.js +137 -0
- package/build/templates/deployment/.gitlab-ci.yml.ejs +6 -12
- package/build/templates/deployment/Dockerfile.app.ejs +2 -2
- package/build/templates/deployment/docker-compose.develop.yml.ejs +1 -1
- package/build/templates/deployment/docker-compose.prod.yml.ejs +1 -1
- package/build/templates/deployment/docker-compose.test.yml.ejs +1 -1
- package/build/templates/monorepro/README.md.ejs +100 -0
- package/build/templates/nest-server-module/inputs/template.input.ts.ejs +2 -2
- package/build/templates/nest-server-module/template.model.ts.ejs +14 -2
- package/build/templates/nest-server-module/template.module.ts.ejs +7 -2
- package/build/templates/nest-server-module/template.service.ts.ejs +8 -3
- package/build/templates/nest-server-object/template-create.input.ts.ejs +18 -0
- package/build/templates/nest-server-object/template.input.ts.ejs +16 -0
- package/build/templates/nest-server-object/template.object.ts.ejs +57 -0
- package/package.json +1 -1
|
@@ -9,6 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
9
9
|
});
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
+
const crypto = require("crypto");
|
|
12
13
|
/**
|
|
13
14
|
* Create a new server
|
|
14
15
|
*/
|
|
@@ -18,8 +19,9 @@ const NewCommand = {
|
|
|
18
19
|
description: 'Creates a new angular (fullstack) workspace',
|
|
19
20
|
hidden: false,
|
|
20
21
|
run: (toolbox) => __awaiter(void 0, void 0, void 0, function* () {
|
|
22
|
+
var _a, _b;
|
|
21
23
|
// Retrieve the tools we need
|
|
22
|
-
const { filesystem, git, helper, parameters, print: { error, info, spin, success }, prompt: { confirm }, strings: { kebabCase }, system, } = toolbox;
|
|
24
|
+
const { filesystem, git, helper, parameters, patching, print: { error, info, spin, success }, prompt: { confirm }, strings: { camelCase, kebabCase, pascalCase }, system, template, } = toolbox;
|
|
23
25
|
// Start timer
|
|
24
26
|
const timer = system.startTimer();
|
|
25
27
|
// Info
|
|
@@ -44,28 +46,17 @@ const NewCommand = {
|
|
|
44
46
|
error(`There's already a folder named "${projectDir}" here.`);
|
|
45
47
|
return undefined;
|
|
46
48
|
}
|
|
47
|
-
//
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
// Get name of the app
|
|
59
|
-
gitLink = yield helper.getInput(null, {
|
|
60
|
-
name: 'git repository link',
|
|
61
|
-
showError: true,
|
|
62
|
-
});
|
|
63
|
-
if (!gitLink) {
|
|
64
|
-
addToGit = false;
|
|
65
|
-
}
|
|
66
|
-
}
|
|
67
|
-
}
|
|
68
|
-
const workspaceSpinner = spin(`Create ${preset} workspace ${projectDir} with ${name} app`);
|
|
49
|
+
// Localize
|
|
50
|
+
const localize = ((_a = parameters.second) === null || _a === void 0 ? void 0 : _a.toLowerCase().includes('localize')) ||
|
|
51
|
+
(!parameters.second && (yield confirm(`Init localize for Angular?`, true)));
|
|
52
|
+
// Nest-Server
|
|
53
|
+
const nestServer = ((_b = parameters.second) === null || _b === void 0 ? void 0 : _b.toLowerCase().includes('nest')) ||
|
|
54
|
+
(!parameters.second && (yield confirm(`Add API (Nest-Server)?`, true)));
|
|
55
|
+
const gitLink = (yield helper.getInput(null, {
|
|
56
|
+
name: 'link to an empty repository (e.g. git@gitlab.lenne.tech:group/project.git or leave empty for no linking)',
|
|
57
|
+
showError: false,
|
|
58
|
+
})).trim();
|
|
59
|
+
const workspaceSpinner = spin(`Create workspace ${projectDir} with ${name} app`);
|
|
69
60
|
// Clone monorepo
|
|
70
61
|
yield system.run(`git clone https://github.com/lenneTech/lt-monorepo.git ${projectDir}`);
|
|
71
62
|
// Check for directory
|
|
@@ -73,36 +64,59 @@ const NewCommand = {
|
|
|
73
64
|
error(`The directory "${projectDir}" could not be created.`);
|
|
74
65
|
return undefined;
|
|
75
66
|
}
|
|
76
|
-
workspaceSpinner.succeed(`Create ${preset} workspace ${projectDir} for ${name} created`);
|
|
77
|
-
// Include example app
|
|
78
|
-
const ngBaseSpinner = spin('Integrate example for Angular');
|
|
79
67
|
// Remove git folder after clone
|
|
80
68
|
yield system.run(`cd ${projectDir} && rm -rf .git`);
|
|
69
|
+
// Set project name
|
|
70
|
+
yield filesystem.write(`${projectDir}/lt.json`, JSON.stringify({ name }));
|
|
71
|
+
yield patching.update(`${projectDir}/package.json`, (data) => {
|
|
72
|
+
data.name = kebabCase(name);
|
|
73
|
+
data.version = '0.0.0';
|
|
74
|
+
return data;
|
|
75
|
+
});
|
|
76
|
+
// Set up initial props (to pass into templates)
|
|
77
|
+
const nameCamel = camelCase(name);
|
|
78
|
+
const nameKebab = kebabCase(name);
|
|
79
|
+
const namePascal = pascalCase(name);
|
|
80
|
+
// Install packages
|
|
81
|
+
yield system.run(`cd ${projectDir} && npm i`);
|
|
81
82
|
// Check if git init is active
|
|
82
|
-
|
|
83
|
-
|
|
83
|
+
yield system.run(`cd ${projectDir} && git init --initial-branch=main`);
|
|
84
|
+
if (gitLink) {
|
|
84
85
|
yield system.run(`cd ${projectDir} && git remote add origin ${gitLink}`);
|
|
85
86
|
yield system.run(`cd ${projectDir} && git add .`);
|
|
86
87
|
yield system.run(`cd ${projectDir} && git commit -m "Initial commit"`);
|
|
87
88
|
yield system.run(`cd ${projectDir} && git push -u origin main`);
|
|
88
89
|
}
|
|
89
|
-
|
|
90
|
-
|
|
90
|
+
workspaceSpinner.succeed(`Create workspace ${projectDir} for ${name} created`);
|
|
91
|
+
// Include example app
|
|
92
|
+
const ngBaseSpinner = spin('Integrate example for Angular');
|
|
91
93
|
// Remove gitkeep file
|
|
92
94
|
yield system.run(`cd ${projectDir}/projects && rm .gitkeep`);
|
|
93
|
-
//
|
|
94
|
-
yield system.run(`cd ${projectDir}/projects
|
|
95
|
-
// Integrate files
|
|
95
|
+
// Clone ng-base-starter
|
|
96
|
+
yield system.run(`cd ${projectDir}/projects && git clone https://github.com/lenneTech/ng-base-starter.git app`);
|
|
96
97
|
if (filesystem.isDirectory(`./${projectDir}/projects/app`)) {
|
|
98
|
+
// Remove git folder after clone
|
|
99
|
+
yield system.run(`cd ${projectDir}/projects/app && rm -rf .git`);
|
|
100
|
+
// Remove husky from app project
|
|
101
|
+
yield system.run(`rm -rf ${projectDir}/projects/app/.husky`);
|
|
102
|
+
yield patching.update(`${projectDir}/projects/app/package.json`, (data) => {
|
|
103
|
+
delete data.scripts.prepare;
|
|
104
|
+
delete data.devDependencies.husky;
|
|
105
|
+
return data;
|
|
106
|
+
});
|
|
107
|
+
if (localize) {
|
|
108
|
+
yield system.run(`cd ${projectDir}/projects/app && ng add @angular/localize --skip-confirmation`);
|
|
109
|
+
}
|
|
110
|
+
// Commit changes
|
|
111
|
+
yield system.run(`cd ${projectDir} && git add . && git commit -am "feat: Angular example integrated"`);
|
|
97
112
|
// Check if git init is active
|
|
98
|
-
if (
|
|
99
|
-
|
|
100
|
-
yield system.run(`cd ${projectDir} && git add . && git commit -am "feat: Angular example integrated" && git push`);
|
|
113
|
+
if (gitLink) {
|
|
114
|
+
`cd ${projectDir} && git push`;
|
|
101
115
|
}
|
|
102
116
|
// Angular example integration done
|
|
103
117
|
ngBaseSpinner.succeed('Example for Angular integrated');
|
|
104
118
|
// Include files from https://github.com/lenneTech/nest-server-starter
|
|
105
|
-
if (
|
|
119
|
+
if (nestServer) {
|
|
106
120
|
// Init
|
|
107
121
|
const serverSpinner = spin(`Integrate Nest Server Starter`);
|
|
108
122
|
// Clone api
|
|
@@ -111,16 +125,36 @@ const NewCommand = {
|
|
|
111
125
|
if (filesystem.isDirectory(`./${projectDir}/projects/api`)) {
|
|
112
126
|
// Remove git folder from clone
|
|
113
127
|
yield system.run(`cd ${projectDir}/projects/api && rm -rf .git`);
|
|
128
|
+
// Remove husky from api project
|
|
129
|
+
yield system.run(`rm -rf ${projectDir}/projects/api/.husky`);
|
|
130
|
+
yield patching.update(`${projectDir}/projects/api/package.json`, (data) => {
|
|
131
|
+
delete data.scripts.prepare;
|
|
132
|
+
delete data.devDependencies.husky;
|
|
133
|
+
return data;
|
|
134
|
+
});
|
|
114
135
|
// Prepare meta.json in api
|
|
115
136
|
filesystem.write(`./${projectDir}/projects/api/src/meta.json`, {
|
|
116
137
|
name: `${name}-api-server`,
|
|
117
138
|
description: `API for ${name} app`,
|
|
118
139
|
version: '0.0.0',
|
|
119
140
|
});
|
|
141
|
+
// Set configuration
|
|
142
|
+
for (const env of ['LOCAL', 'DEV', 'TEST', 'PREV', 'PROD']) {
|
|
143
|
+
yield patching.replace(`./${projectDir}/projects/api/src/config.env.ts`, 'SECRET_OR_PRIVATE_KEY_' + env, crypto.randomBytes(512).toString('base64'));
|
|
144
|
+
yield patching.replace(`./${projectDir}/projects/api/src/config.env.ts`, 'SECRET_OR_PRIVATE_KEY_' + env + '_REFRESH', crypto.randomBytes(512).toString('base64'));
|
|
145
|
+
}
|
|
146
|
+
yield patching.update(`./${projectDir}/projects/api/src/config.env.ts`, (data) => data.replace(/nest-server-/g, projectDir + '-'));
|
|
147
|
+
// Set readme
|
|
148
|
+
yield template.generate({
|
|
149
|
+
template: 'monorepro/README.md.ejs',
|
|
150
|
+
target: `./${projectDir}/README.md`,
|
|
151
|
+
props: { repository: gitLink || 'REPOSITORY', name, nameCamel, nameKebab, namePascal },
|
|
152
|
+
});
|
|
153
|
+
// Commit changes
|
|
154
|
+
yield system.run(`cd ${projectDir} && git add . && git commit -am "feat: Nest Server Starter integrated"`);
|
|
120
155
|
// Check if git init is active
|
|
121
|
-
if (
|
|
122
|
-
|
|
123
|
-
yield system.run(`cd ${projectDir} && git add . && git commit -am "feat: Nest Server Starter integrated" && git push`);
|
|
156
|
+
if (gitLink) {
|
|
157
|
+
`cd ${projectDir} && git push`;
|
|
124
158
|
}
|
|
125
159
|
// Done
|
|
126
160
|
serverSpinner.succeed('Nest Server Starter integrated');
|
|
@@ -131,15 +165,22 @@ const NewCommand = {
|
|
|
131
165
|
}
|
|
132
166
|
// Install all packages
|
|
133
167
|
const installSpinner = spin('Install all packages');
|
|
134
|
-
yield system.run(`cd ${projectDir} && npm
|
|
135
|
-
|
|
168
|
+
yield system.run(`cd ${projectDir} && npm run init`);
|
|
169
|
+
// Commit changes
|
|
170
|
+
yield system.run(`cd ${projectDir} && git add . && git commit -am "feat: Initialization of workspace done"`);
|
|
171
|
+
// Check if git init is active
|
|
172
|
+
if (gitLink) {
|
|
173
|
+
`cd ${projectDir} && git push`;
|
|
174
|
+
}
|
|
175
|
+
installSpinner.succeed('Successfully installed all packages');
|
|
136
176
|
// We're done, so show what to do next
|
|
137
177
|
info(``);
|
|
138
|
-
success(`Generated
|
|
178
|
+
success(`Generated workspace ${projectDir} with ${name} app in ${helper.msToMinutesAndSeconds(timer())}m.`);
|
|
139
179
|
info(``);
|
|
140
180
|
info(`Next:`);
|
|
141
|
-
info(`
|
|
181
|
+
info(` Test and run ${name}:`);
|
|
142
182
|
info(` $ cd ${projectDir}`);
|
|
183
|
+
info(` $ npm run test`);
|
|
143
184
|
info(` $ npm run start`);
|
|
144
185
|
info(``);
|
|
145
186
|
if (!toolbox.parameters.options.fromGluegunMenu) {
|
|
@@ -151,4 +192,4 @@ const NewCommand = {
|
|
|
151
192
|
}),
|
|
152
193
|
};
|
|
153
194
|
exports.default = NewCommand;
|
|
154
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
195
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"create.js","sourceRoot":"","sources":["../../../src/commands/angular/create.ts"],"names":[],"mappings":"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"}
|
|
@@ -20,27 +20,63 @@ const NewCommand = {
|
|
|
20
20
|
hidden: false,
|
|
21
21
|
run: (toolbox) => __awaiter(void 0, void 0, void 0, function* () {
|
|
22
22
|
// Retrieve the tools we need
|
|
23
|
-
const { filesystem, helper, parameters, print: { info, spin, success }, strings: { kebabCase, pascalCase, camelCase }, prompt: { confirm }, system, template, } = toolbox;
|
|
23
|
+
const { filesystem, helper, parameters, patching, print: { info, spin, success }, strings: { kebabCase, pascalCase, camelCase }, prompt: { confirm }, system, template, } = toolbox;
|
|
24
24
|
// Start timer
|
|
25
25
|
const timer = system.startTimer();
|
|
26
26
|
// Info
|
|
27
27
|
info('Create a new deployment');
|
|
28
|
+
// Get default project name
|
|
29
|
+
let projectName = '';
|
|
30
|
+
const config = yield filesystem.exists('lt.json');
|
|
31
|
+
if (config) {
|
|
32
|
+
yield patching.update(`lt.json`, (data) => {
|
|
33
|
+
projectName = data.name;
|
|
34
|
+
return data;
|
|
35
|
+
});
|
|
36
|
+
}
|
|
37
|
+
if (!projectName) {
|
|
38
|
+
yield patching.update(`package.json`, (data) => {
|
|
39
|
+
projectName = pascalCase(data.name);
|
|
40
|
+
return data;
|
|
41
|
+
});
|
|
42
|
+
}
|
|
28
43
|
// Get name
|
|
29
44
|
const name = yield helper.getInput(parameters.first, {
|
|
30
|
-
|
|
45
|
+
initial: projectName,
|
|
46
|
+
name: 'project name (e.g. ' + (projectName ? projectName : 'My new project') + ')',
|
|
31
47
|
});
|
|
32
48
|
if (!name) {
|
|
33
49
|
return;
|
|
34
50
|
}
|
|
35
|
-
// Get
|
|
36
|
-
const
|
|
37
|
-
|
|
51
|
+
// Get domain
|
|
52
|
+
const domain = yield helper.getInput(parameters.second, {
|
|
53
|
+
initial: kebabCase(name) + '.lenne.tech',
|
|
54
|
+
name: 'main domain of the project (e.g. ' + kebabCase(name) + '.lenne.tech)',
|
|
38
55
|
});
|
|
39
56
|
if (!name) {
|
|
40
57
|
return;
|
|
41
58
|
}
|
|
42
59
|
const gitHub = yield confirm(`Add GitHub pipeline?`);
|
|
43
60
|
const gitLab = yield confirm(`Add GitLab pipeline?`);
|
|
61
|
+
// GitLab test runner
|
|
62
|
+
let testRunner;
|
|
63
|
+
let prodRunner;
|
|
64
|
+
if (gitLab) {
|
|
65
|
+
testRunner = yield helper.getInput('', {
|
|
66
|
+
initial: 'docker-swarm',
|
|
67
|
+
name: 'runner for test (tag in .gitlab-ci.yml, e.g. docker-swarm)',
|
|
68
|
+
});
|
|
69
|
+
if (!testRunner) {
|
|
70
|
+
return;
|
|
71
|
+
}
|
|
72
|
+
prodRunner = yield helper.getInput('', {
|
|
73
|
+
initial: 'docker-landing',
|
|
74
|
+
name: 'runner for production (tag in .gitlab-ci.yml, e.g. docker-landing)',
|
|
75
|
+
});
|
|
76
|
+
if (!prodRunner) {
|
|
77
|
+
return;
|
|
78
|
+
}
|
|
79
|
+
}
|
|
44
80
|
// Set up initial props (to pass into templates)
|
|
45
81
|
const nameCamel = camelCase(name);
|
|
46
82
|
const nameKebab = kebabCase(name);
|
|
@@ -87,26 +123,72 @@ const NewCommand = {
|
|
|
87
123
|
yield template.generate({
|
|
88
124
|
template: 'deployment/.github/workflows/pre-release.yml.ejs',
|
|
89
125
|
target: (0, path_1.join)(cwd, '.github', 'workflows', 'pre-release.yml'),
|
|
90
|
-
props: { nameCamel, nameKebab, namePascal, url },
|
|
126
|
+
props: { nameCamel, nameKebab, namePascal, url: domain },
|
|
91
127
|
});
|
|
92
128
|
yield template.generate({
|
|
93
129
|
template: 'deployment/.github/workflows/release.yml.ejs',
|
|
94
130
|
target: (0, path_1.join)(cwd, '.github', 'workflows', 'release.yml'),
|
|
95
|
-
props: { nameCamel, nameKebab, namePascal, url },
|
|
131
|
+
props: { nameCamel, nameKebab, namePascal, url: domain },
|
|
96
132
|
});
|
|
97
133
|
}
|
|
98
134
|
if (gitLab) {
|
|
99
135
|
yield template.generate({
|
|
100
136
|
template: 'deployment/.gitlab-ci.yml.ejs',
|
|
101
137
|
target: (0, path_1.join)(cwd, '.gitlab-ci.yml'),
|
|
102
|
-
props: { nameCamel, nameKebab, namePascal, url },
|
|
138
|
+
props: { nameCamel, nameKebab, namePascal, url: domain, testRunner, prodRunner },
|
|
103
139
|
});
|
|
104
140
|
}
|
|
105
141
|
generateSpinner.succeed('Files generated');
|
|
142
|
+
const environmentsSpinner = spin('Update app environment files');
|
|
143
|
+
const prodEnv = yield filesystem.exists('projects/app/src/environments/environment.prod.ts');
|
|
144
|
+
if (prodEnv) {
|
|
145
|
+
yield patching.patch('projects/app/src/environments/environment.prod.ts', {
|
|
146
|
+
replace: new RegExp('http://127.0.0.1:3000', 'g'),
|
|
147
|
+
insert: 'https://api.' + domain,
|
|
148
|
+
});
|
|
149
|
+
yield patching.patch('projects/app/src/environments/environment.prod.ts', {
|
|
150
|
+
replace: new RegExp('ws://127.0.0.1:3000', 'g'),
|
|
151
|
+
insert: 'wss://api.' + domain,
|
|
152
|
+
});
|
|
153
|
+
yield patching.patch('projects/app/src/environments/environment.prod.ts', {
|
|
154
|
+
replace: new RegExp('http://127.0.0.1:4200', 'g'),
|
|
155
|
+
insert: 'https://' + domain,
|
|
156
|
+
});
|
|
157
|
+
}
|
|
158
|
+
else {
|
|
159
|
+
info('Missing projects/app/src/environments/environment.prod.ts');
|
|
160
|
+
}
|
|
161
|
+
const testEnv = yield filesystem.exists('projects/app/src/environments/environment.test.ts');
|
|
162
|
+
if (testEnv) {
|
|
163
|
+
yield patching.patch('projects/app/src/environments/environment.test.ts', {
|
|
164
|
+
replace: new RegExp('http://127.0.0.1:3000', 'g'),
|
|
165
|
+
insert: 'https://api.test.' + domain,
|
|
166
|
+
});
|
|
167
|
+
yield patching.patch('projects/app/src/environments/environment.test.ts', {
|
|
168
|
+
replace: new RegExp('ws://127.0.0.1:3000', 'g'),
|
|
169
|
+
insert: 'wss://api.test.' + domain,
|
|
170
|
+
});
|
|
171
|
+
yield patching.patch('projects/app/src/environments/environment.test.ts', {
|
|
172
|
+
replace: new RegExp('http://127.0.0.1:4200', 'g'),
|
|
173
|
+
insert: 'https://test.' + domain,
|
|
174
|
+
});
|
|
175
|
+
}
|
|
176
|
+
else {
|
|
177
|
+
info('Missing projects/app/src/environments/environment.test.ts');
|
|
178
|
+
}
|
|
179
|
+
environmentsSpinner.succeed('App environment files updated');
|
|
106
180
|
// We're done, so show what to do next
|
|
107
181
|
info(``);
|
|
108
182
|
success(`Generated deployment for ${namePascal} in ${helper.msToMinutesAndSeconds(timer())}m.`);
|
|
109
183
|
info(``);
|
|
184
|
+
// Hint for CI/CD
|
|
185
|
+
const subDomains = ['www', 'api', 'test', 'www.test', 'api.test'];
|
|
186
|
+
let urlStr = '\n- ' + domain;
|
|
187
|
+
for (const sub of subDomains) {
|
|
188
|
+
urlStr += '\n- ' + sub + '.' + domain;
|
|
189
|
+
}
|
|
190
|
+
success(`HINT: please initialize following Domains before running the CI/CD pipeline:${urlStr}`);
|
|
191
|
+
info(``);
|
|
110
192
|
if (!toolbox.parameters.options.fromGluegunMenu) {
|
|
111
193
|
process.exit();
|
|
112
194
|
}
|
|
@@ -115,4 +197,4 @@ const NewCommand = {
|
|
|
115
197
|
}),
|
|
116
198
|
};
|
|
117
199
|
exports.default = NewCommand;
|
|
118
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
200
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"create.js","sourceRoot":"","sources":["../../../src/commands/deployment/create.ts"],"names":[],"mappings":";;;;;;;;;;;AACA,+BAA4B;AAG5B;;GAEG;AACH,MAAM,UAAU,GAAmB;IACjC,IAAI,EAAE,QAAQ;IACd,KAAK,EAAE,CAAC,IAAI,CAAC;IACb,WAAW,EAAE,8CAA8C;IAC3D,MAAM,EAAE,KAAK;IACb,GAAG,EAAE,CAAO,OAA+B,EAAE,EAAE;QAC7C,6BAA6B;QAC7B,MAAM,EACJ,UAAU,EACV,MAAM,EACN,UAAU,EACV,QAAQ,EACR,KAAK,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,EAC9B,OAAO,EAAE,EAAE,SAAS,EAAE,UAAU,EAAE,SAAS,EAAE,EAC7C,MAAM,EAAE,EAAE,OAAO,EAAE,EACnB,MAAM,EACN,QAAQ,GACT,GAAG,OAAO,CAAC;QAEZ,cAAc;QACd,MAAM,KAAK,GAAG,MAAM,CAAC,UAAU,EAAE,CAAC;QAElC,OAAO;QACP,IAAI,CAAC,yBAAyB,CAAC,CAAC;QAEhC,2BAA2B;QAC3B,IAAI,WAAW,GAAG,EAAE,CAAC;QACrB,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QAClD,IAAI,MAAM,EAAE;YACV,MAAM,QAAQ,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC,IAAyB,EAAE,EAAE;gBAC7D,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC;gBACxB,OAAO,IAAI,CAAC;YACd,CAAC,CAAC,CAAC;SACJ;QAED,IAAI,CAAC,WAAW,EAAE;YAChB,MAAM,QAAQ,CAAC,MAAM,CAAC,cAAc,EAAE,CAAC,IAAyB,EAAE,EAAE;gBAClE,WAAW,GAAG,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBACpC,OAAO,IAAI,CAAC;YACd,CAAC,CAAC,CAAC;SACJ;QAED,WAAW;QACX,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,KAAK,EAAE;YACnD,OAAO,EAAE,WAAW;YACpB,IAAI,EAAE,qBAAqB,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,gBAAgB,CAAC,GAAG,GAAG;SACnF,CAAC,CAAC;QAEH,IAAI,CAAC,IAAI,EAAE;YACT,OAAO;SACR;QAED,aAAa;QACb,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,MAAM,EAAE;YACtD,OAAO,EAAE,SAAS,CAAC,IAAI,CAAC,GAAG,aAAa;YACxC,IAAI,EAAE,mCAAmC,GAAG,SAAS,CAAC,IAAI,CAAC,GAAG,cAAc;SAC7E,CAAC,CAAC;QAEH,IAAI,CAAC,IAAI,EAAE;YACT,OAAO;SACR;QAED,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,sBAAsB,CAAC,CAAC;QACrD,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,sBAAsB,CAAC,CAAC;QAErD,qBAAqB;QACrB,IAAI,UAAU,CAAC;QACf,IAAI,UAAU,CAAC;QACf,IAAI,MAAM,EAAE;YACV,UAAU,GAAG,MAAM,MAAM,CAAC,QAAQ,CAAC,EAAE,EAAE;gBACrC,OAAO,EAAE,cAAc;gBACvB,IAAI,EAAE,4DAA4D;aACnE,CAAC,CAAC;YACH,IAAI,CAAC,UAAU,EAAE;gBACf,OAAO;aACR;YACD,UAAU,GAAG,MAAM,MAAM,CAAC,QAAQ,CAAC,EAAE,EAAE;gBACrC,OAAO,EAAE,gBAAgB;gBACzB,IAAI,EAAE,oEAAoE;aAC3E,CAAC,CAAC;YACH,IAAI,CAAC,UAAU,EAAE;gBACf,OAAO;aACR;SACF;QAED,gDAAgD;QAChD,MAAM,SAAS,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC;QAClC,MAAM,SAAS,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC;QAClC,MAAM,UAAU,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC;QAEpC,qBAAqB;QACrB,MAAM,GAAG,GAAG,UAAU,CAAC,GAAG,EAAE,CAAC;QAE7B,MAAM,eAAe,GAAG,IAAI,CAAC,gBAAgB,CAAC,CAAC;QAE/C,MAAM,QAAQ,CAAC,QAAQ,CAAC;YACtB,QAAQ,EAAE,sCAAsC;YAChD,MAAM,EAAE,IAAA,WAAI,EAAC,GAAG,EAAE,SAAS,EAAE,eAAe,CAAC;YAC7C,KAAK,EAAE,EAAE,SAAS,EAAE,SAAS,EAAE,UAAU,EAAE;SAC5C,CAAC,CAAC;QAEH,MAAM,QAAQ,CAAC,QAAQ,CAAC;YACtB,QAAQ,EAAE,kCAAkC;YAC5C,MAAM,EAAE,IAAA,WAAI,EAAC,GAAG,EAAE,SAAS,EAAE,WAAW,CAAC;YACzC,KAAK,EAAE,EAAE,SAAS,EAAE,SAAS,EAAE,UAAU,EAAE;SAC5C,CAAC,CAAC;QAEH,MAAM,QAAQ,CAAC,QAAQ,CAAC;YACtB,QAAQ,EAAE,2BAA2B;YACrC,MAAM,EAAE,IAAA,WAAI,EAAC,GAAG,EAAE,YAAY,CAAC;YAC/B,KAAK,EAAE,EAAE,SAAS,EAAE,SAAS,EAAE,UAAU,EAAE;SAC5C,CAAC,CAAC;QAEH,MAAM,QAAQ,CAAC,QAAQ,CAAC;YACtB,QAAQ,EAAE,+BAA+B;YACzC,MAAM,EAAE,IAAA,WAAI,EAAC,GAAG,EAAE,gBAAgB,CAAC;YACnC,KAAK,EAAE,EAAE,SAAS,EAAE,SAAS,EAAE,UAAU,EAAE;SAC5C,CAAC,CAAC;QAEH,MAAM,QAAQ,CAAC,QAAQ,CAAC;YACtB,QAAQ,EAAE,2CAA2C;YACrD,MAAM,EAAE,IAAA,WAAI,EAAC,GAAG,EAAE,4BAA4B,CAAC;YAC/C,KAAK,EAAE,EAAE,SAAS,EAAE,SAAS,EAAE,UAAU,EAAE;SAC5C,CAAC,CAAC;QAEH,MAAM,QAAQ,CAAC,QAAQ,CAAC;YACtB,QAAQ,EAAE,wCAAwC;YAClD,MAAM,EAAE,IAAA,WAAI,EAAC,GAAG,EAAE,yBAAyB,CAAC;YAC5C,KAAK,EAAE,EAAE,SAAS,EAAE,SAAS,EAAE,UAAU,EAAE;SAC5C,CAAC,CAAC;QAEH,MAAM,QAAQ,CAAC,QAAQ,CAAC;YACtB,QAAQ,EAAE,wCAAwC;YAClD,MAAM,EAAE,IAAA,WAAI,EAAC,GAAG,EAAE,yBAAyB,CAAC;YAC5C,KAAK,EAAE,EAAE,SAAS,EAAE,SAAS,EAAE,UAAU,EAAE;SAC5C,CAAC,CAAC;QAEH,IAAI,MAAM,EAAE;YACV,MAAM,QAAQ,CAAC,QAAQ,CAAC;gBACtB,QAAQ,EAAE,kDAAkD;gBAC5D,MAAM,EAAE,IAAA,WAAI,EAAC,GAAG,EAAE,SAAS,EAAE,WAAW,EAAE,iBAAiB,CAAC;gBAC5D,KAAK,EAAE,EAAE,SAAS,EAAE,SAAS,EAAE,UAAU,EAAE,GAAG,EAAE,MAAM,EAAE;aACzD,CAAC,CAAC;YAEH,MAAM,QAAQ,CAAC,QAAQ,CAAC;gBACtB,QAAQ,EAAE,8CAA8C;gBACxD,MAAM,EAAE,IAAA,WAAI,EAAC,GAAG,EAAE,SAAS,EAAE,WAAW,EAAE,aAAa,CAAC;gBACxD,KAAK,EAAE,EAAE,SAAS,EAAE,SAAS,EAAE,UAAU,EAAE,GAAG,EAAE,MAAM,EAAE;aACzD,CAAC,CAAC;SACJ;QAED,IAAI,MAAM,EAAE;YACV,MAAM,QAAQ,CAAC,QAAQ,CAAC;gBACtB,QAAQ,EAAE,+BAA+B;gBACzC,MAAM,EAAE,IAAA,WAAI,EAAC,GAAG,EAAE,gBAAgB,CAAC;gBACnC,KAAK,EAAE,EAAE,SAAS,EAAE,SAAS,EAAE,UAAU,EAAE,GAAG,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE;aACjF,CAAC,CAAC;SACJ;QAED,eAAe,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC;QAE3C,MAAM,mBAAmB,GAAG,IAAI,CAAC,8BAA8B,CAAC,CAAC;QACjE,MAAM,OAAO,GAAG,MAAM,UAAU,CAAC,MAAM,CAAC,mDAAmD,CAAC,CAAC;QAC7F,IAAI,OAAO,EAAE;YACX,MAAM,QAAQ,CAAC,KAAK,CAAC,mDAAmD,EAAE;gBACxE,OAAO,EAAE,IAAI,MAAM,CAAC,uBAAuB,EAAE,GAAG,CAAC;gBACjD,MAAM,EAAE,cAAc,GAAG,MAAM;aAChC,CAAC,CAAC;YACH,MAAM,QAAQ,CAAC,KAAK,CAAC,mDAAmD,EAAE;gBACxE,OAAO,EAAE,IAAI,MAAM,CAAC,qBAAqB,EAAE,GAAG,CAAC;gBAC/C,MAAM,EAAE,YAAY,GAAG,MAAM;aAC9B,CAAC,CAAC;YACH,MAAM,QAAQ,CAAC,KAAK,CAAC,mDAAmD,EAAE;gBACxE,OAAO,EAAE,IAAI,MAAM,CAAC,uBAAuB,EAAE,GAAG,CAAC;gBACjD,MAAM,EAAE,UAAU,GAAG,MAAM;aAC5B,CAAC,CAAC;SACJ;aAAM;YACL,IAAI,CAAC,2DAA2D,CAAC,CAAC;SACnE;QAED,MAAM,OAAO,GAAG,MAAM,UAAU,CAAC,MAAM,CAAC,mDAAmD,CAAC,CAAC;QAC7F,IAAI,OAAO,EAAE;YACX,MAAM,QAAQ,CAAC,KAAK,CAAC,mDAAmD,EAAE;gBACxE,OAAO,EAAE,IAAI,MAAM,CAAC,uBAAuB,EAAE,GAAG,CAAC;gBACjD,MAAM,EAAE,mBAAmB,GAAG,MAAM;aACrC,CAAC,CAAC;YACH,MAAM,QAAQ,CAAC,KAAK,CAAC,mDAAmD,EAAE;gBACxE,OAAO,EAAE,IAAI,MAAM,CAAC,qBAAqB,EAAE,GAAG,CAAC;gBAC/C,MAAM,EAAE,iBAAiB,GAAG,MAAM;aACnC,CAAC,CAAC;YACH,MAAM,QAAQ,CAAC,KAAK,CAAC,mDAAmD,EAAE;gBACxE,OAAO,EAAE,IAAI,MAAM,CAAC,uBAAuB,EAAE,GAAG,CAAC;gBACjD,MAAM,EAAE,eAAe,GAAG,MAAM;aACjC,CAAC,CAAC;SACJ;aAAM;YACL,IAAI,CAAC,2DAA2D,CAAC,CAAC;SACnE;QAED,mBAAmB,CAAC,OAAO,CAAC,+BAA+B,CAAC,CAAC;QAE7D,sCAAsC;QACtC,IAAI,CAAC,EAAE,CAAC,CAAC;QACT,OAAO,CAAC,4BAA4B,UAAU,OAAO,MAAM,CAAC,qBAAqB,CAAC,KAAK,EAAE,CAAC,IAAI,CAAC,CAAC;QAChG,IAAI,CAAC,EAAE,CAAC,CAAC;QAET,iBAAiB;QACjB,MAAM,UAAU,GAAG,CAAC,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC;QAClE,IAAI,MAAM,GAAG,MAAM,GAAG,MAAM,CAAC;QAC7B,KAAK,MAAM,GAAG,IAAI,UAAU,EAAE;YAC5B,MAAM,IAAI,MAAM,GAAG,GAAG,GAAG,GAAG,GAAG,MAAM,CAAC;SACvC;QACD,OAAO,CAAC,+EAA+E,MAAM,EAAE,CAAC,CAAC;QACjG,IAAI,CAAC,EAAE,CAAC,CAAC;QAET,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,eAAe,EAAE;YAC/C,OAAO,CAAC,IAAI,EAAE,CAAC;SAChB;QAED,YAAY;QACZ,OAAO,kBAAkB,IAAI,EAAE,CAAC;IAClC,CAAC,CAAA;CACF,CAAC;AAEF,kBAAe,UAAU,CAAC"}
|
|
@@ -19,7 +19,7 @@ const NewCommand = {
|
|
|
19
19
|
hidden: false,
|
|
20
20
|
run: (toolbox) => __awaiter(void 0, void 0, void 0, function* () {
|
|
21
21
|
// Retrieve the tools we need
|
|
22
|
-
const { git, helper, npm, parameters, print: { error, info, spin, success }, prompt, system, } = toolbox;
|
|
22
|
+
const { filesystem, git, helper, npm, parameters, print: { error, info, spin, success }, prompt, system, } = toolbox;
|
|
23
23
|
// Start timer
|
|
24
24
|
const timer = system.startTimer();
|
|
25
25
|
// Check git
|
|
@@ -108,6 +108,12 @@ const NewCommand = {
|
|
|
108
108
|
checkoutSpin.succeed();
|
|
109
109
|
// Install npm packages
|
|
110
110
|
yield npm.install();
|
|
111
|
+
// Init lerna projects
|
|
112
|
+
if (filesystem.isFile(`./lerna.json`)) {
|
|
113
|
+
const initProjectsSpin = spin('Init projects');
|
|
114
|
+
yield system.run(`npm run init --if-present`);
|
|
115
|
+
initProjectsSpin.succeed();
|
|
116
|
+
}
|
|
111
117
|
// Success info
|
|
112
118
|
success(`${remoteBranch ? 'Remote' : 'Local'} branch ${branch} checked out in ${helper.msToMinutesAndSeconds(timer())}m.`);
|
|
113
119
|
info('');
|
|
@@ -119,4 +125,4 @@ const NewCommand = {
|
|
|
119
125
|
}),
|
|
120
126
|
};
|
|
121
127
|
exports.default = NewCommand;
|
|
122
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
128
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2V0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2NvbW1hbmRzL2dpdC9nZXQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7QUFHQTs7R0FFRztBQUNILE1BQU0sVUFBVSxHQUFtQjtJQUNqQyxJQUFJLEVBQUUsS0FBSztJQUNYLEtBQUssRUFBRSxDQUFDLEdBQUcsQ0FBQztJQUNaLFdBQVcsRUFBRSxxQkFBcUI7SUFDbEMsTUFBTSxFQUFFLEtBQUs7SUFDYixHQUFHLEVBQUUsQ0FBTyxPQUErQixFQUFFLEVBQUU7UUFDN0MsNkJBQTZCO1FBQzdCLE1BQU0sRUFDSixVQUFVLEVBQ1YsR0FBRyxFQUNILE1BQU0sRUFDTixHQUFHLEVBQ0gsVUFBVSxFQUNWLEtBQUssRUFBRSxFQUFFLEtBQUssRUFBRSxJQUFJLEVBQUUsSUFBSSxFQUFFLE9BQU8sRUFBRSxFQUNyQyxNQUFNLEVBQ04sTUFBTSxHQUNQLEdBQUcsT0FBTyxDQUFDO1FBRVosY0FBYztRQUNkLE1BQU0sS0FBSyxHQUFHLE1BQU0sQ0FBQyxVQUFVLEVBQUUsQ0FBQztRQUVsQyxZQUFZO1FBQ1osSUFBSSxDQUFDLENBQUMsTUFBTSxHQUFHLENBQUMsWUFBWSxFQUFFLENBQUMsRUFBRTtZQUMvQixPQUFPO1NBQ1I7UUFFRCw0QkFBNEI7UUFDNUIsTUFBTSxVQUFVLEdBQUcsTUFBTSxNQUFNLENBQUMsUUFBUSxDQUFDLFVBQVUsQ0FBQyxLQUFLLEVBQUU7WUFDekQsSUFBSSxFQUFFLGFBQWE7WUFDbkIsU0FBUyxFQUFFLElBQUk7U0FDaEIsQ0FBQyxDQUFDO1FBQ0gsSUFBSSxDQUFDLFVBQVUsRUFBRTtZQUNmLE9BQU87U0FDUjtRQUVELG9EQUFvRDtRQUNwRCxJQUFJLENBQUMsQ0FBQyxNQUFNLEdBQUcsQ0FBQyxXQUFXLENBQUMsRUFBRSxTQUFTLEVBQUUsSUFBSSxFQUFFLENBQUMsQ0FBQyxFQUFFO1lBQ2pELE9BQU87U0FDUjtRQUVELGdEQUFnRDtRQUNoRCxNQUFNLE1BQU0sR0FBRyxNQUFNLEdBQUcsQ0FBQyxTQUFTLENBQUMsVUFBVSxFQUFFO1lBQzdDLEtBQUssRUFBRSxJQUFJO1lBQ1gsS0FBSyxFQUFFLEtBQUs7WUFDWixNQUFNLEVBQUUsS0FBSztZQUNiLElBQUksRUFBRSxJQUFJO1NBQ1gsQ0FBQyxDQUFDO1FBQ0gsSUFBSSxDQUFDLE1BQU0sRUFBRTtZQUNYLE9BQU87U0FDUjtRQUVELG9CQUFvQjtRQUNwQixNQUFNLFlBQVksR0FBRyxNQUFNLEdBQUcsQ0FBQyxTQUFTLENBQUMsTUFBTSxFQUFFLEVBQUUsTUFBTSxFQUFFLElBQUksRUFBRSxDQUFDLENBQUM7UUFFbkUsMEJBQTBCO1FBQzFCLElBQUksVUFBVSxLQUFLLE1BQU0sRUFBRTtZQUN6QixJQUNFLENBQUMsVUFBVSxDQUFDLE9BQU8sQ0FBQyxTQUFTO2dCQUM3QixDQUFDLENBQUMsTUFBTSxNQUFNLENBQUMsT0FBTyxDQUFDLFdBQVcsR0FBRyxDQUFDLFlBQVksQ0FBQyxDQUFDLENBQUMsUUFBUSxDQUFDLENBQUMsQ0FBQyxPQUFPLENBQUMsR0FBRyxVQUFVLEdBQUcsTUFBTSxDQUFDLENBQUMsRUFDaEc7Z0JBQ0EsT0FBTzthQUNSO1NBQ0Y7UUFFRCxrQkFBa0I7UUFDbEIsTUFBTSxNQUFNLENBQUMsR0FBRyxDQUFDLGVBQWUsR0FBRyxDQUFDLENBQUMsTUFBTSxHQUFHLENBQUMsZ0JBQWdCLEVBQUUsQ0FBQyxJQUFJLE1BQU0sQ0FBQyxDQUFDLENBQUM7UUFDL0UsSUFBSSxZQUFZLENBQUM7UUFFakIsc0JBQXNCO1FBQ3RCLElBQUksWUFBWSxFQUFFO1lBQ2hCLGVBQWU7WUFDZixJQUFJLE9BQU8sR0FBRyxLQUFLLENBQUM7WUFDcEIsTUFBTSxTQUFTLEdBQUcsSUFBSSxDQUFDLGNBQWMsQ0FBQyxDQUFDO1lBQ3ZDLElBQUksTUFBTSxLQUFLLE1BQU0sSUFBSSxNQUFNLElBQUksQ0FBQyxNQUFNLEdBQUcsQ0FBQyxTQUFTLENBQUMsTUFBTSxFQUFFLEVBQUUsWUFBWSxFQUFFLEVBQUUsRUFBRSxDQUFDLENBQUMsQ0FBQyxNQUFNLEVBQUU7Z0JBQzdGLFNBQVMsQ0FBQyxPQUFPLEVBQUUsQ0FBQztnQkFDcEIsSUFBSSxJQUFJLEdBQUcsVUFBVSxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUM7Z0JBQ25DLElBQUksQ0FBQyxJQUFJLEVBQUU7b0JBQ1QsSUFBSSxNQUFNLE1BQU0sQ0FBQyxPQUFPLENBQUMsMkJBQTJCLE1BQU0sRUFBRSxDQUFDLEVBQUU7d0JBQzdELElBQUksR0FBRyxNQUFNLENBQUM7cUJBQ2Y7aUJBQ0Y7Z0JBQ0QsSUFBSSxJQUFJLEtBQUssTUFBTSxFQUFFO29CQUNuQixNQUFNLFdBQVcsR0FBRyxJQUFJLENBQUMsVUFBVSxHQUFHLE1BQU0sQ0FBQyxDQUFDO29CQUM5QyxNQUFNLE1BQU0sQ0FBQyxHQUFHLENBQUMsaUJBQWlCLE1BQU0sRUFBRSxDQUFDLENBQUM7b0JBQzVDLE9BQU8sR0FBRyxJQUFJLENBQUM7b0JBQ2YsV0FBVyxDQUFDLE9BQU8sRUFBRSxDQUFDO2lCQUN2QjthQUNGO2lCQUFNO2dCQUNMLFNBQVMsQ0FBQyxPQUFPLEVBQUUsQ0FBQzthQUNyQjtZQUVELGFBQWE7WUFDYixZQUFZLEdBQUcsSUFBSSxDQUFDLFdBQVcsR0FBRyxNQUFNLENBQUMsQ0FBQztZQUUxQyw2Q0FBNkM7WUFDN0MsSUFBSSxPQUFPLElBQUksQ0FBQyxDQUFDLE1BQU0sR0FBRyxDQUFDLFNBQVMsQ0FBQyxNQUFNLEVBQUUsRUFBRSxLQUFLLEVBQUUsSUFBSSxFQUFFLENBQUMsQ0FBQyxFQUFFO2dCQUM5RCxNQUFNLE1BQU0sQ0FBQyxHQUFHLENBQ2QsNENBQTRDLE1BQU0sbURBQW1ELENBQ3RHLENBQUM7Z0JBRUYsd0JBQXdCO2FBQ3pCO2lCQUFNO2dCQUNMLE1BQU0sTUFBTSxDQUFDLEdBQUcsQ0FBQyw2QkFBNkIsTUFBTSxtREFBbUQsQ0FBQyxDQUFDO2FBQzFHO1lBRUQsMEJBQTBCO1NBQzNCO2FBQU0sSUFBSSxNQUFNLEVBQUU7WUFDakIsWUFBWSxHQUFHLElBQUksQ0FBQyxXQUFXLEdBQUcsTUFBTSxDQUFDLENBQUM7WUFDMUMsTUFBTSxNQUFNLENBQUMsR0FBRyxDQUFDLDZCQUE2QixNQUFNLHVDQUF1QyxDQUFDLENBQUM7WUFFN0Ysa0JBQWtCO1NBQ25CO2FBQU07WUFDTCxLQUFLLENBQUMsVUFBVSxNQUFNLGFBQWEsQ0FBQyxDQUFDO1lBQ3JDLE9BQU87U0FDUjtRQUVELGdCQUFnQjtRQUNoQixZQUFZLENBQUMsT0FBTyxFQUFFLENBQUM7UUFFdkIsdUJBQXVCO1FBQ3ZCLE1BQU0sR0FBRyxDQUFDLE9BQU8sRUFBRSxDQUFDO1FBRXBCLHNCQUFzQjtRQUN0QixJQUFJLFVBQVUsQ0FBQyxNQUFNLENBQUMsY0FBYyxDQUFDLEVBQUU7WUFDckMsTUFBTSxnQkFBZ0IsR0FBRyxJQUFJLENBQUMsZUFBZSxDQUFDLENBQUM7WUFDL0MsTUFBTSxNQUFNLENBQUMsR0FBRyxDQUFDLDJCQUEyQixDQUFDLENBQUM7WUFDOUMsZ0JBQWdCLENBQUMsT0FBTyxFQUFFLENBQUM7U0FDNUI7UUFFRCxlQUFlO1FBQ2YsT0FBTyxDQUNMLEdBQUcsWUFBWSxDQUFDLENBQUMsQ0FBQyxRQUFRLENBQUMsQ0FBQyxDQUFDLE9BQU8sV0FBVyxNQUFNLG1CQUFtQixNQUFNLENBQUMscUJBQXFCLENBQUMsS0FBSyxFQUFFLENBQUMsSUFBSSxDQUNsSCxDQUFDO1FBQ0YsSUFBSSxDQUFDLEVBQUUsQ0FBQyxDQUFDO1FBQ1QsSUFBSSxDQUFDLE9BQU8sQ0FBQyxVQUFVLENBQUMsT0FBTyxDQUFDLGVBQWUsRUFBRTtZQUMvQyxPQUFPLENBQUMsSUFBSSxFQUFFLENBQUM7U0FDaEI7UUFFRCxZQUFZO1FBQ1osT0FBTyxjQUFjLE1BQU0sRUFBRSxDQUFDO0lBQ2hDLENBQUMsQ0FBQTtDQUNGLENBQUM7QUFFRixrQkFBZSxVQUFVLENBQUMifQ==
|
|
@@ -77,6 +77,7 @@ const NewCommand = {
|
|
|
77
77
|
// Set configuration
|
|
78
78
|
for (const env of ['LOCAL', 'DEV', 'TEST', 'PREV', 'PROD']) {
|
|
79
79
|
yield patching.replace(`./${projectDir}/src/config.env.ts`, 'SECRET_OR_PRIVATE_KEY_' + env, crypto.randomBytes(512).toString('base64'));
|
|
80
|
+
yield patching.replace(`./${projectDir}/src/config.env.ts`, 'SECRET_OR_PRIVATE_KEY_' + env + '_REFRESH', crypto.randomBytes(512).toString('base64'));
|
|
80
81
|
}
|
|
81
82
|
yield patching.update(`./${projectDir}/src/config.env.ts`, (data) => data.replace(/nest-server-/g, projectDir + '-'));
|
|
82
83
|
// Set package.json
|
|
@@ -132,4 +133,4 @@ const NewCommand = {
|
|
|
132
133
|
}),
|
|
133
134
|
};
|
|
134
135
|
exports.default = NewCommand;
|
|
135
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
136
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY3JlYXRlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2NvbW1hbmRzL3NlcnZlci9jcmVhdGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7QUFBQSxpQ0FBaUM7QUFJakM7O0dBRUc7QUFDSCxNQUFNLFVBQVUsR0FBbUI7SUFDakMsSUFBSSxFQUFFLFFBQVE7SUFDZCxLQUFLLEVBQUUsQ0FBQyxHQUFHLENBQUM7SUFDWixXQUFXLEVBQUUsc0JBQXNCO0lBQ25DLE1BQU0sRUFBRSxLQUFLO0lBQ2IsR0FBRyxFQUFFLENBQU8sT0FBK0IsRUFBRSxFQUFFO1FBQzdDLDZCQUE2QjtRQUM3QixNQUFNLEVBQ0osVUFBVSxFQUNWLEdBQUcsRUFDSCxNQUFNLEVBQ04sSUFBSSxFQUNKLFVBQVUsRUFDVixRQUFRLEVBQ1IsS0FBSyxFQUFFLEVBQUUsS0FBSyxFQUFFLElBQUksRUFBRSxJQUFJLEVBQUUsT0FBTyxFQUFFLEVBQ3JDLE9BQU8sRUFBRSxFQUFFLFNBQVMsRUFBRSxFQUN0QixNQUFNLEVBQ04sUUFBUSxHQUNULEdBQUcsT0FBTyxDQUFDO1FBRVosY0FBYztRQUNkLE1BQU0sS0FBSyxHQUFHLE1BQU0sQ0FBQyxVQUFVLEVBQUUsQ0FBQztRQUVsQyxPQUFPO1FBQ1AsSUFBSSxDQUFDLHFCQUFxQixDQUFDLENBQUM7UUFFNUIsWUFBWTtRQUNaLElBQUksQ0FBQyxDQUFDLE1BQU0sR0FBRyxDQUFDLFlBQVksRUFBRSxDQUFDLEVBQUU7WUFDL0IsT0FBTztTQUNSO1FBRUQsV0FBVztRQUNYLE1BQU0sSUFBSSxHQUFHLE1BQU0sTUFBTSxDQUFDLFFBQVEsQ0FBQyxVQUFVLENBQUMsS0FBSyxFQUFFO1lBQ25ELElBQUksRUFBRSxhQUFhO1lBQ25CLFNBQVMsRUFBRSxJQUFJO1NBQ2hCLENBQUMsQ0FBQztRQUNILElBQUksQ0FBQyxJQUFJLEVBQUU7WUFDVCxPQUFPO1NBQ1I7UUFFRCx3QkFBd0I7UUFDeEIsTUFB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
|
|
@@ -68,7 +68,7 @@ const NewCommand = {
|
|
|
68
68
|
type: 'select',
|
|
69
69
|
name: 'input',
|
|
70
70
|
message: 'Choose property type',
|
|
71
|
-
choices: ['boolean', 'string', 'number', 'ObjectId / Reference', 'Date', 'Use own'],
|
|
71
|
+
choices: ['boolean', 'string', 'number', 'ObjectId / Reference', 'Date', 'enum', 'Use own'],
|
|
72
72
|
},
|
|
73
73
|
])).input;
|
|
74
74
|
if (type === 'ObjectId / Reference') {
|
|
@@ -81,6 +81,7 @@ const NewCommand = {
|
|
|
81
81
|
message: `Enter property type (e.g. MyClass or MyClass[])`,
|
|
82
82
|
})).input;
|
|
83
83
|
let reference;
|
|
84
|
+
let enumRef;
|
|
84
85
|
if (type === 'ObjectId') {
|
|
85
86
|
reference = (yield ask({
|
|
86
87
|
type: 'input',
|
|
@@ -92,15 +93,26 @@ const NewCommand = {
|
|
|
92
93
|
refsSet = true;
|
|
93
94
|
}
|
|
94
95
|
}
|
|
96
|
+
else if (type === 'enum') {
|
|
97
|
+
enumRef = (yield ask({
|
|
98
|
+
type: 'input',
|
|
99
|
+
name: 'input',
|
|
100
|
+
initial: pascalCase(name) + 'Enum',
|
|
101
|
+
message: `Enter enum type`,
|
|
102
|
+
})).input;
|
|
103
|
+
if (enumRef) {
|
|
104
|
+
refsSet = true;
|
|
105
|
+
}
|
|
106
|
+
}
|
|
95
107
|
const arrayEnding = type.endsWith('[]');
|
|
96
108
|
type = type.replace('[]', '');
|
|
97
109
|
const isArray = arrayEnding || (yield confirm(`Array?`));
|
|
98
110
|
const nullable = yield confirm(`Nullable?`, true);
|
|
99
|
-
props[name] = { name, nullable, isArray, type, reference };
|
|
111
|
+
props[name] = { name, nullable, isArray, type, reference, enumRef };
|
|
100
112
|
}
|
|
101
113
|
const generateSpinner = spin('Generate files');
|
|
102
114
|
const inputTemplate = server.propsForInput(props, { modelName: name, nullable: true });
|
|
103
|
-
const createTemplate = server.propsForInput(props, { modelName: name, nullable: false });
|
|
115
|
+
const createTemplate = server.propsForInput(props, { modelName: name, nullable: false, create: true });
|
|
104
116
|
const modelTemplate = server.propsForModel(props, { modelName: name });
|
|
105
117
|
// nest-server-module/inputs/xxx.input.ts
|
|
106
118
|
yield template.generate({
|
|
@@ -198,4 +210,4 @@ const NewCommand = {
|
|
|
198
210
|
}),
|
|
199
211
|
};
|
|
200
212
|
exports.default = NewCommand;
|
|
201
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
213
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"module.js","sourceRoot":"","sources":["../../../src/commands/server/module.ts"],"names":[],"mappings":"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"}
|