yiyuanjs 1.0.15 → 1.0.16
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/dist/commands/analyze.d.ts.map +1 -1
- package/dist/commands/analyze.js +1 -3
- package/dist/commands/analyze.js.map +1 -1
- package/dist/commands/dev.d.ts.map +1 -1
- package/dist/commands/dev.js +87 -164
- package/dist/commands/dev.js.map +1 -1
- package/dist/commands/generate.d.ts.map +1 -1
- package/dist/commands/generate.js +75 -185
- package/dist/commands/generate.js.map +1 -1
- package/package.json +2 -2
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"analyze.d.ts","sourceRoot":"","sources":["../../src/commands/analyze.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAUpC,eAAO,MAAM,cAAc,
|
|
1
|
+
{"version":3,"file":"analyze.d.ts","sourceRoot":"","sources":["../../src/commands/analyze.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAUpC,eAAO,MAAM,cAAc,SA+DvB,CAAC"}
|
package/dist/commands/analyze.js
CHANGED
|
@@ -54,9 +54,7 @@ export const analyzeCommand = new Command('analyze')
|
|
|
54
54
|
const outputPath = path.resolve(process.cwd(), opts.output);
|
|
55
55
|
fs.writeFileSync(outputPath, JSON.stringify(output, null, 2), 'utf-8');
|
|
56
56
|
spinner.succeed(chalk.green(`Schema generated: ${opts.output}`));
|
|
57
|
-
console.log(chalk.dim(` Entities: ${(output.entities ?? []).length}`));
|
|
58
|
-
console.log(chalk.dim(` Pages: ${(output.pages ?? []).length}`));
|
|
59
|
-
console.log(chalk.dim(` APIs: ${(output.apis ?? []).length}\n`));
|
|
57
|
+
console.log(chalk.dim(` Entities: ${(output.entities ?? []).length}\n`));
|
|
60
58
|
}
|
|
61
59
|
catch (err) {
|
|
62
60
|
spinner.fail(chalk.red(`AI analysis failed: ${err.message}\n`));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"analyze.js","sourceRoot":"","sources":["../../src/commands/analyze.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"analyze.js","sourceRoot":"","sources":["../../src/commands/analyze.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dev.d.ts","sourceRoot":"","sources":["../../src/commands/dev.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"dev.d.ts","sourceRoot":"","sources":["../../src/commands/dev.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAuCpC,eAAO,MAAM,UAAU,SA2EnB,CAAC"}
|
package/dist/commands/dev.js
CHANGED
|
@@ -11,217 +11,140 @@ function isTermux() {
|
|
|
11
11
|
return false;
|
|
12
12
|
}
|
|
13
13
|
}
|
|
14
|
-
function
|
|
14
|
+
function has(cmd) {
|
|
15
15
|
try {
|
|
16
|
-
|
|
17
|
-
`/data/data/com.termux/files/usr/bin/${cmd}`,
|
|
18
|
-
`/usr/bin/${cmd}`,
|
|
19
|
-
`/usr/local/bin/${cmd}`,
|
|
20
|
-
];
|
|
21
|
-
if (paths.some(p => fs.existsSync(p)))
|
|
16
|
+
if (fs.existsSync(`/data/data/com.termux/files/usr/bin/${cmd}`))
|
|
22
17
|
return true;
|
|
23
|
-
|
|
18
|
+
if (fs.existsSync(`/usr/bin/${cmd}`))
|
|
19
|
+
return true;
|
|
20
|
+
execSync(`${cmd} --version`, { stdio: 'ignore', timeout: 2000 });
|
|
24
21
|
return true;
|
|
25
22
|
}
|
|
26
23
|
catch {
|
|
27
24
|
return false;
|
|
28
25
|
}
|
|
29
26
|
}
|
|
30
|
-
function
|
|
27
|
+
function install(pkg) {
|
|
31
28
|
try {
|
|
32
|
-
execSync(
|
|
29
|
+
execSync(`pkg install -y ${pkg}`, { stdio: 'inherit', timeout: 120000 });
|
|
33
30
|
return true;
|
|
34
31
|
}
|
|
35
32
|
catch {
|
|
36
33
|
return false;
|
|
37
34
|
}
|
|
38
35
|
}
|
|
39
|
-
function
|
|
36
|
+
function run(bin, args, cwd) {
|
|
40
37
|
const p = spawn(bin, args, { cwd, stdio: 'inherit' });
|
|
41
|
-
p.on('error', (
|
|
38
|
+
p.on('error', (e) => console.log(chalk.red(` Error: ${e.message}`)));
|
|
42
39
|
return p;
|
|
43
40
|
}
|
|
44
|
-
function
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
}
|
|
53
|
-
catch { }
|
|
54
|
-
}
|
|
55
|
-
// Try yiyuan.schema.json
|
|
56
|
-
const schemaPath = path.join(root, 'yiyuan.schema.json');
|
|
57
|
-
if (fs.existsSync(schemaPath)) {
|
|
58
|
-
try {
|
|
59
|
-
const schema = JSON.parse(fs.readFileSync(schemaPath, 'utf-8'));
|
|
60
|
-
if (schema.techStack?.backend)
|
|
61
|
-
return schema.techStack.backend;
|
|
41
|
+
function getConfig(root) {
|
|
42
|
+
for (const f of ['yiyuan.config.json', 'yiyuan.schema.json']) {
|
|
43
|
+
const p = path.join(root, f);
|
|
44
|
+
if (fs.existsSync(p)) {
|
|
45
|
+
try {
|
|
46
|
+
return JSON.parse(fs.readFileSync(p, 'utf-8'));
|
|
47
|
+
}
|
|
48
|
+
catch { }
|
|
62
49
|
}
|
|
63
|
-
catch { }
|
|
64
50
|
}
|
|
65
51
|
return null;
|
|
66
52
|
}
|
|
67
|
-
function ensurePython() {
|
|
68
|
-
if (hasCommand('python'))
|
|
69
|
-
return true;
|
|
70
|
-
if (!isTermux()) {
|
|
71
|
-
console.log(chalk.red(' Python not found. Install it first.'));
|
|
72
|
-
return false;
|
|
73
|
-
}
|
|
74
|
-
console.log(chalk.cyan(' Installing Python...'));
|
|
75
|
-
return runSync('pkg install -y python');
|
|
76
|
-
}
|
|
77
|
-
function ensureUvicorn() {
|
|
78
|
-
try {
|
|
79
|
-
execSync('python -m uvicorn --version', { stdio: 'ignore', timeout: 3000 });
|
|
80
|
-
return true;
|
|
81
|
-
}
|
|
82
|
-
catch { }
|
|
83
|
-
if (!isTermux()) {
|
|
84
|
-
console.log(chalk.red(' uvicorn not found. Run: pip install uvicorn'));
|
|
85
|
-
return false;
|
|
86
|
-
}
|
|
87
|
-
console.log(chalk.cyan(' Installing uvicorn...'));
|
|
88
|
-
return runSync('pip install uvicorn');
|
|
89
|
-
}
|
|
90
|
-
function ensureGo() {
|
|
91
|
-
if (hasCommand('go'))
|
|
92
|
-
return true;
|
|
93
|
-
if (!isTermux()) {
|
|
94
|
-
console.log(chalk.red(' Go not found. Install it first.'));
|
|
95
|
-
return false;
|
|
96
|
-
}
|
|
97
|
-
console.log(chalk.cyan(' Installing Go...'));
|
|
98
|
-
return runSync('pkg install -y golang');
|
|
99
|
-
}
|
|
100
53
|
export const devCommand = new Command('dev')
|
|
101
54
|
.description('Start development environment')
|
|
102
|
-
.option('--
|
|
103
|
-
.option('--
|
|
104
|
-
.option('--port <port>', 'Server port', '3000')
|
|
105
|
-
.option('--host <host>', 'Bind host', '0.0.0.0')
|
|
55
|
+
.option('--port <port>', 'Port', '3000')
|
|
56
|
+
.option('--host <host>', 'Host', '0.0.0.0')
|
|
106
57
|
.action(async (opts) => {
|
|
107
58
|
const root = process.cwd();
|
|
108
|
-
const
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
console.log(chalk.
|
|
112
|
-
process.exit(1);
|
|
113
|
-
}
|
|
114
|
-
// Get backend from config file (not scanner)
|
|
115
|
-
const backend = getBackendFromConfig(root);
|
|
116
|
-
if (!backend) {
|
|
117
|
-
console.log(chalk.red('\n Cannot detect backend. Run: yiyuan generate\n'));
|
|
59
|
+
const config = getConfig(root);
|
|
60
|
+
if (!config?.techStack?.backend) {
|
|
61
|
+
console.log(chalk.red('\n No project config found.'));
|
|
62
|
+
console.log(chalk.dim(' Run: yiyuan generate\n'));
|
|
118
63
|
process.exit(1);
|
|
119
64
|
}
|
|
65
|
+
const backend = config.techStack.backend;
|
|
66
|
+
const frontend = config.techStack.frontend;
|
|
67
|
+
const port = opts.port;
|
|
68
|
+
const host = opts.host;
|
|
69
|
+
const serverDir = path.join(root, 'server');
|
|
70
|
+
const frontendDir = path.join(root, 'frontend');
|
|
120
71
|
const termux = isTermux();
|
|
121
|
-
const isAlpine = fs.existsSync(path.join(root, 'frontend/index.html'));
|
|
122
|
-
const port = opts.port || '3000';
|
|
123
|
-
const host = opts.host || '0.0.0.0';
|
|
124
|
-
const procs = [];
|
|
125
|
-
if (termux)
|
|
126
|
-
console.log(chalk.cyan(' Termux detected'));
|
|
127
72
|
console.log(chalk.dim(` Backend: ${backend}`));
|
|
128
|
-
|
|
129
|
-
|
|
73
|
+
console.log(chalk.dim(` Frontend: ${frontend}`));
|
|
74
|
+
if (termux)
|
|
75
|
+
console.log(chalk.dim(' Termux: yes'));
|
|
76
|
+
const procs = [];
|
|
77
|
+
// Start server
|
|
78
|
+
if (fs.existsSync(serverDir)) {
|
|
79
|
+
let cmd = null;
|
|
130
80
|
if (backend === 'fastapi') {
|
|
131
|
-
if (!
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
return null;
|
|
81
|
+
if (!has('python')) {
|
|
82
|
+
if (termux)
|
|
83
|
+
install('python');
|
|
84
|
+
else {
|
|
85
|
+
console.log(chalk.red(' python not found'));
|
|
86
|
+
process.exit(1);
|
|
87
|
+
}
|
|
139
88
|
}
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
if (backend === 'flask') {
|
|
143
|
-
if (!ensurePython())
|
|
144
|
-
return null;
|
|
145
|
-
const runPy = path.join(serverDir, 'run.py');
|
|
146
|
-
if (!fs.existsSync(runPy)) {
|
|
147
|
-
console.log(chalk.red(` run.py not found. Run: yiyuan generate --force`));
|
|
148
|
-
return null;
|
|
89
|
+
if (!has('uvicorn')) {
|
|
90
|
+
execSync('pip install uvicorn', { stdio: 'inherit' });
|
|
149
91
|
}
|
|
150
|
-
|
|
92
|
+
cmd = { bin: 'python', args: ['-m', 'uvicorn', 'main:app', '--reload', '--port', port, '--host', host] };
|
|
151
93
|
}
|
|
152
|
-
if (backend === '
|
|
153
|
-
if (!
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
return { bin: 'python', args: ['manage.py', 'runserver', `${host}:${port}`], cwd: serverDir };
|
|
161
|
-
}
|
|
162
|
-
if (backend === 'gin' || backend === 'fiber') {
|
|
163
|
-
if (!ensureGo())
|
|
164
|
-
return null;
|
|
165
|
-
const mainGo = path.join(serverDir, 'main.go');
|
|
166
|
-
if (!fs.existsSync(mainGo)) {
|
|
167
|
-
console.log(chalk.red(` main.go not found. Run: yiyuan generate --force`));
|
|
168
|
-
return null;
|
|
94
|
+
else if (backend === 'flask') {
|
|
95
|
+
if (!has('python')) {
|
|
96
|
+
if (termux)
|
|
97
|
+
install('python');
|
|
98
|
+
else {
|
|
99
|
+
console.log(chalk.red(' python not found'));
|
|
100
|
+
process.exit(1);
|
|
101
|
+
}
|
|
169
102
|
}
|
|
170
|
-
|
|
103
|
+
cmd = { bin: 'python', args: ['run.py'] };
|
|
171
104
|
}
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
return { bin: 'npx', args: ['tsx', 'watch', 'src/index.ts'], cwd: serverDir };
|
|
181
|
-
const npmBin = process.platform === 'win32' ? 'npm.cmd' : 'npm';
|
|
182
|
-
return { bin: npmBin, args: ['run', 'dev'], cwd: serverDir };
|
|
183
|
-
}
|
|
184
|
-
// Alpine.js + JS backend = serve frontend from backend
|
|
185
|
-
if (isAlpine && hasServer && hasFrontend && !opts.frontend) {
|
|
186
|
-
const cmd = getServerCmd();
|
|
187
|
-
if (cmd) {
|
|
188
|
-
console.log(chalk.cyan(' Starting server...'));
|
|
189
|
-
console.log(chalk.dim(` http://${host}:${port}`));
|
|
190
|
-
procs.push(runBin(cmd.bin, cmd.args, cmd.cwd));
|
|
191
|
-
}
|
|
192
|
-
}
|
|
193
|
-
else {
|
|
194
|
-
if (hasServer && (!opts.frontend || opts.server)) {
|
|
195
|
-
const cmd = getServerCmd();
|
|
196
|
-
if (cmd) {
|
|
197
|
-
console.log(chalk.cyan(' Starting server...'));
|
|
198
|
-
console.log(chalk.dim(` http://${host}:${port}`));
|
|
199
|
-
procs.push(runBin(cmd.bin, cmd.args, cmd.cwd));
|
|
105
|
+
else if (backend === 'django') {
|
|
106
|
+
if (!has('python')) {
|
|
107
|
+
if (termux)
|
|
108
|
+
install('python');
|
|
109
|
+
else {
|
|
110
|
+
console.log(chalk.red(' python not found'));
|
|
111
|
+
process.exit(1);
|
|
112
|
+
}
|
|
200
113
|
}
|
|
114
|
+
cmd = { bin: 'python', args: ['manage.py', 'runserver', `${host}:${port}`] };
|
|
201
115
|
}
|
|
202
|
-
if (
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
console.log(chalk.cyan(' Starting frontend...'));
|
|
207
|
-
procs.push(runBin(npmBin, ['run', 'dev'], frontendDir));
|
|
208
|
-
}
|
|
209
|
-
else if (isAlpine) {
|
|
210
|
-
if (hasCommand('python')) {
|
|
211
|
-
console.log(chalk.cyan(' Starting frontend...'));
|
|
212
|
-
procs.push(runBin('python', ['-m', 'http.server', '5173', '--bind', host], frontendDir));
|
|
213
|
-
}
|
|
116
|
+
else if (backend === 'gin' || backend === 'fiber') {
|
|
117
|
+
if (!has('go')) {
|
|
118
|
+
if (termux)
|
|
119
|
+
install('golang');
|
|
214
120
|
else {
|
|
215
|
-
console.log(chalk.
|
|
121
|
+
console.log(chalk.red(' go not found'));
|
|
122
|
+
process.exit(1);
|
|
216
123
|
}
|
|
217
124
|
}
|
|
125
|
+
cmd = { bin: 'go', args: ['run', 'main.go'] };
|
|
126
|
+
}
|
|
127
|
+
else {
|
|
128
|
+
// JS/TS backends
|
|
129
|
+
process.env.PORT = port;
|
|
130
|
+
process.env.HOST = host;
|
|
131
|
+
cmd = { bin: 'npm', args: ['run', 'dev'] };
|
|
218
132
|
}
|
|
133
|
+
if (cmd) {
|
|
134
|
+
console.log(chalk.cyan(` Server: http://${host}:${port}`));
|
|
135
|
+
procs.push(run(cmd.bin, cmd.args, serverDir));
|
|
136
|
+
}
|
|
137
|
+
}
|
|
138
|
+
// Start frontend (skip for alpine-pico, served from backend)
|
|
139
|
+
if (frontend !== 'alpine-pico' && fs.existsSync(frontendDir) && fs.existsSync(path.join(frontendDir, 'package.json'))) {
|
|
140
|
+
console.log(chalk.cyan(' Frontend: starting...'));
|
|
141
|
+
procs.push(run('npm', ['run', 'dev'], frontendDir));
|
|
219
142
|
}
|
|
220
143
|
if (procs.length === 0) {
|
|
221
144
|
console.log(chalk.yellow('\n Nothing to start\n'));
|
|
222
145
|
return;
|
|
223
146
|
}
|
|
224
|
-
console.log(chalk.dim('\n
|
|
147
|
+
console.log(chalk.dim('\n Ctrl+C to stop\n'));
|
|
225
148
|
process.on('SIGINT', () => { procs.forEach(p => { try {
|
|
226
149
|
p.kill();
|
|
227
150
|
}
|
package/dist/commands/dev.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dev.js","sourceRoot":"","sources":["../../src/commands/dev.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAClC,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"dev.js","sourceRoot":"","sources":["../../src/commands/dev.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate.d.ts","sourceRoot":"","sources":["../../src/commands/generate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"generate.d.ts","sourceRoot":"","sources":["../../src/commands/generate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAiDpC,eAAO,MAAM,eAAe,SAqIxB,CAAC"}
|
|
@@ -4,256 +4,145 @@ import * as path from 'node:path';
|
|
|
4
4
|
import chalk from 'chalk';
|
|
5
5
|
import ora from 'ora';
|
|
6
6
|
import { spawn, execSync } from 'node:child_process';
|
|
7
|
-
import { parseProject, GeneratorEngine, createPrismaGenerator, createDrizzleGenerator, createTypeORMGenerator, createMongoDBGenerator, createExpressGenerator, createNestJSGenerator, createHonoGenerator, createFastAPIGenerator, createFlaskGenerator, createDjangoGenerator, createGinGenerator, createFiberGenerator, createReactGenerator, createVueGenerator, createNextGenerator, createNuxtGenerator, createAlpinePicoGenerator, createAuthGenerator, createTestGenerator, createDockerGenerator, createSwaggerGenerator, createMiddlewareGenerator,
|
|
8
|
-
|
|
9
|
-
function isTermux() {
|
|
7
|
+
import { parseProject, GeneratorEngine, createPrismaGenerator, createDrizzleGenerator, createTypeORMGenerator, createMongoDBGenerator, createExpressGenerator, createNestJSGenerator, createHonoGenerator, createFastAPIGenerator, createFlaskGenerator, createDjangoGenerator, createGinGenerator, createFiberGenerator, createReactGenerator, createVueGenerator, createNextGenerator, createNuxtGenerator, createAlpinePicoGenerator, createAuthGenerator, createTestGenerator, createDockerGenerator, createSwaggerGenerator, createMiddlewareGenerator, createHealthGenerator, createCICDGenerator, createI18nGenerator, } from 'yiyuanjs-core';
|
|
8
|
+
function has(cmd) {
|
|
10
9
|
try {
|
|
11
|
-
|
|
12
|
-
}
|
|
13
|
-
catch {
|
|
14
|
-
return false;
|
|
15
|
-
}
|
|
16
|
-
}
|
|
17
|
-
function hasCommand(cmd) {
|
|
18
|
-
try {
|
|
19
|
-
const paths = [
|
|
20
|
-
`/data/data/com.termux/files/usr/bin/${cmd}`,
|
|
21
|
-
`/usr/bin/${cmd}`,
|
|
22
|
-
`/usr/local/bin/${cmd}`,
|
|
23
|
-
];
|
|
24
|
-
if (paths.some(p => fs.existsSync(p)))
|
|
10
|
+
if (fs.existsSync(`/data/data/com.termux/files/usr/bin/${cmd}`))
|
|
25
11
|
return true;
|
|
26
|
-
execSync(`${cmd} --version`, { stdio: 'ignore', timeout:
|
|
27
|
-
return true;
|
|
28
|
-
}
|
|
29
|
-
catch {
|
|
30
|
-
return false;
|
|
31
|
-
}
|
|
32
|
-
}
|
|
33
|
-
function runSync(cmd) {
|
|
34
|
-
try {
|
|
35
|
-
execSync(cmd, { stdio: 'ignore', timeout: 120000 });
|
|
12
|
+
execSync(`${cmd} --version`, { stdio: 'ignore', timeout: 2000 });
|
|
36
13
|
return true;
|
|
37
14
|
}
|
|
38
15
|
catch {
|
|
39
16
|
return false;
|
|
40
17
|
}
|
|
41
18
|
}
|
|
42
|
-
function
|
|
19
|
+
function run(bin, args, cwd) {
|
|
43
20
|
return new Promise((resolve, reject) => {
|
|
44
21
|
const p = spawn(bin, args, { cwd, stdio: 'inherit' });
|
|
45
22
|
p.on('close', (code) => code === 0 ? resolve() : reject(new Error(`${bin} failed (${code})`)));
|
|
46
23
|
p.on('error', reject);
|
|
47
24
|
});
|
|
48
25
|
}
|
|
49
|
-
const
|
|
26
|
+
const BACKEND = {
|
|
50
27
|
express: createExpressGenerator, nestjs: createNestJSGenerator, hono: createHonoGenerator,
|
|
51
28
|
fastapi: createFastAPIGenerator, flask: createFlaskGenerator, django: createDjangoGenerator,
|
|
52
29
|
gin: createGinGenerator, fiber: createFiberGenerator,
|
|
53
30
|
};
|
|
54
|
-
const
|
|
31
|
+
const FRONTEND = {
|
|
55
32
|
react: createReactGenerator, vue: createVueGenerator, next: createNextGenerator,
|
|
56
33
|
nuxt: createNuxtGenerator, 'alpine-pico': createAlpinePicoGenerator,
|
|
57
34
|
};
|
|
58
|
-
const
|
|
35
|
+
const DATABASE = {
|
|
59
36
|
prisma: createPrismaGenerator, drizzle: createDrizzleGenerator,
|
|
60
37
|
typeorm: createTypeORMGenerator, mongodb: createMongoDBGenerator,
|
|
61
38
|
};
|
|
62
|
-
function npmInstall(dir) {
|
|
63
|
-
const npmBin = process.platform === 'win32' ? 'npm.cmd' : 'npm';
|
|
64
|
-
return runBin(npmBin, ['install', '--no-optional', '--ignore-scripts'], dir);
|
|
65
|
-
}
|
|
66
|
-
function pipInstall(reqFile) {
|
|
67
|
-
const dir = path.dirname(reqFile);
|
|
68
|
-
if (hasCommand('python'))
|
|
69
|
-
return runBin('python', ['-m', 'pip', 'install', '-r', reqFile], dir);
|
|
70
|
-
return runBin('pip', ['install', '-r', reqFile], dir);
|
|
71
|
-
}
|
|
72
|
-
function prismaGenerate(dir) {
|
|
73
|
-
const localBin = path.join(dir, 'node_modules/.bin/prisma');
|
|
74
|
-
if (fs.existsSync(localBin))
|
|
75
|
-
return runBin(localBin, ['generate'], dir);
|
|
76
|
-
const npxBin = process.platform === 'win32' ? 'npx.cmd' : 'npx';
|
|
77
|
-
return runBin(npxBin, ['prisma', 'generate'], dir);
|
|
78
|
-
}
|
|
79
|
-
function ensureDeps(backend) {
|
|
80
|
-
const termux = isTermux();
|
|
81
|
-
if (!termux)
|
|
82
|
-
return;
|
|
83
|
-
const isPython = ['fastapi', 'flask', 'django'].includes(backend);
|
|
84
|
-
const isGo = ['gin', 'fiber'].includes(backend);
|
|
85
|
-
if (isPython && !hasCommand('python')) {
|
|
86
|
-
console.log(chalk.cyan(' Installing Python...'));
|
|
87
|
-
runSync('pkg install -y python');
|
|
88
|
-
}
|
|
89
|
-
if (isPython && !hasCommand('pip')) {
|
|
90
|
-
console.log(chalk.cyan(' Installing pip...'));
|
|
91
|
-
runSync('pkg install -y python-pip');
|
|
92
|
-
}
|
|
93
|
-
if (isGo && !hasCommand('go')) {
|
|
94
|
-
console.log(chalk.cyan(' Installing Go...'));
|
|
95
|
-
runSync('pkg install -y golang');
|
|
96
|
-
}
|
|
97
|
-
}
|
|
98
39
|
export const generateCommand = new Command('generate')
|
|
99
40
|
.description('Generate code from schema')
|
|
100
41
|
.option('-s, --schema <file>', 'Schema file', 'yiyuan.schema.json')
|
|
101
42
|
.option('-o, --output <dir>', 'Output directory', '.')
|
|
102
|
-
.option('--
|
|
103
|
-
.option('--no-install', 'Skip
|
|
104
|
-
.option('--no-docker', 'Skip Docker files')
|
|
105
|
-
.option('--no-test', 'Skip test generation')
|
|
106
|
-
.option('--no-swagger', 'Skip Swagger/OpenAPI')
|
|
107
|
-
.option('--graphql', 'Include GraphQL')
|
|
108
|
-
.option('--websocket', 'Include WebSocket')
|
|
109
|
-
.option('--queue', 'Include job queue')
|
|
110
|
-
.option('--force', 'Overwrite all files including user-modified ones')
|
|
43
|
+
.option('--force', 'Overwrite all files')
|
|
44
|
+
.option('--no-install', 'Skip dependency installation')
|
|
111
45
|
.action(async (opts) => {
|
|
112
|
-
const configPath = path.resolve(process.cwd(), 'yiyuan.config.json');
|
|
113
|
-
let config = {};
|
|
114
|
-
if (fs.existsSync(configPath)) {
|
|
115
|
-
try {
|
|
116
|
-
config = JSON.parse(fs.readFileSync(configPath, 'utf-8'));
|
|
117
|
-
}
|
|
118
|
-
catch { }
|
|
119
|
-
}
|
|
120
46
|
const schemaPath = path.resolve(process.cwd(), opts.schema);
|
|
121
47
|
if (!fs.existsSync(schemaPath)) {
|
|
122
48
|
console.log(chalk.red(`\n Schema not found: ${schemaPath}`));
|
|
123
|
-
console.log(chalk.cyan('
|
|
49
|
+
console.log(chalk.cyan(' Run: yiyuan schema\n'));
|
|
124
50
|
process.exit(1);
|
|
125
51
|
}
|
|
126
52
|
let raw;
|
|
127
53
|
try {
|
|
128
54
|
raw = JSON.parse(fs.readFileSync(schemaPath, 'utf-8'));
|
|
129
55
|
}
|
|
130
|
-
catch (
|
|
131
|
-
console.log(chalk.red(`\n Invalid JSON: ${
|
|
56
|
+
catch (e) {
|
|
57
|
+
console.log(chalk.red(`\n Invalid JSON: ${e.message}\n`));
|
|
132
58
|
process.exit(1);
|
|
133
59
|
}
|
|
134
|
-
|
|
135
|
-
const
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
if (g)
|
|
143
|
-
engine.register(g());
|
|
60
|
+
// Merge config if exists
|
|
61
|
+
const configPath = path.resolve(process.cwd(), 'yiyuan.config.json');
|
|
62
|
+
if (fs.existsSync(configPath)) {
|
|
63
|
+
try {
|
|
64
|
+
const config = JSON.parse(fs.readFileSync(configPath, 'utf-8'));
|
|
65
|
+
raw = { ...config, ...raw };
|
|
66
|
+
}
|
|
67
|
+
catch { }
|
|
144
68
|
}
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
engine.register(g());
|
|
69
|
+
let project;
|
|
70
|
+
try {
|
|
71
|
+
project = parseProject(raw);
|
|
149
72
|
}
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
engine.register(g());
|
|
73
|
+
catch (e) {
|
|
74
|
+
console.log(chalk.red(`\n Schema error: ${e.message}\n`));
|
|
75
|
+
process.exit(1);
|
|
154
76
|
}
|
|
155
|
-
const
|
|
156
|
-
const
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
77
|
+
const spinner = ora('Generating...').start();
|
|
78
|
+
const engine = new GeneratorEngine();
|
|
79
|
+
const ts = project.techStack;
|
|
80
|
+
const isJs = ['express', 'nestjs', 'hono'].includes(ts.backend);
|
|
81
|
+
// Register generators
|
|
82
|
+
const dbGen = DATABASE[ts.database];
|
|
83
|
+
if (dbGen)
|
|
84
|
+
engine.register(dbGen());
|
|
85
|
+
const beGen = BACKEND[ts.backend];
|
|
86
|
+
if (beGen)
|
|
87
|
+
engine.register(beGen());
|
|
88
|
+
const feGen = FRONTEND[ts.frontend];
|
|
89
|
+
if (feGen)
|
|
90
|
+
engine.register(feGen());
|
|
91
|
+
if (isJs) {
|
|
160
92
|
engine.register(createMiddlewareGenerator());
|
|
161
|
-
if (isJsBackend && (!opts.only || opts.only === 'health'))
|
|
162
93
|
engine.register(createHealthGenerator());
|
|
163
|
-
if (isJsBackend && opts.test !== false && (!opts.only || opts.only === 'test'))
|
|
164
94
|
engine.register(createTestGenerator());
|
|
165
|
-
if (isJsBackend && opts.swagger !== false && (!opts.only || opts.only === 'swagger'))
|
|
166
95
|
engine.register(createSwaggerGenerator());
|
|
167
|
-
if (opts.docker !== false && (!opts.only || opts.only === 'docker'))
|
|
168
96
|
engine.register(createDockerGenerator());
|
|
169
|
-
if (!opts.only || opts.only === 'cicd')
|
|
170
97
|
engine.register(createCICDGenerator());
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
98
|
+
if (project.auth.enabled)
|
|
99
|
+
engine.register(createAuthGenerator());
|
|
100
|
+
}
|
|
101
|
+
if (['react', 'vue', 'next', 'nuxt'].includes(ts.frontend)) {
|
|
174
102
|
engine.register(createI18nGenerator());
|
|
175
|
-
|
|
176
|
-
engine.register(createGraphQLGenerator());
|
|
177
|
-
if (isJsBackend && opts.websocket && (!opts.only || opts.only === 'websocket'))
|
|
178
|
-
engine.register(createWebSocketGenerator());
|
|
179
|
-
if (isJsBackend && opts.queue && (!opts.only || opts.only === 'queue'))
|
|
180
|
-
engine.register(createQueueGenerator());
|
|
103
|
+
}
|
|
181
104
|
const outputDir = path.resolve(process.cwd(), opts.output);
|
|
182
105
|
try {
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
const lock = loadLock(outputDir);
|
|
186
|
-
let skipped = 0, written = 0;
|
|
106
|
+
const files = await engine.run(project, outputDir);
|
|
107
|
+
let written = 0;
|
|
187
108
|
for (const file of files) {
|
|
188
109
|
const fullPath = path.resolve(outputDir, file.path);
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
}
|
|
192
|
-
catch { }
|
|
193
|
-
if (!opts.force && !shouldOverwrite(outputDir, file.path, file.content)) {
|
|
194
|
-
skipped++;
|
|
195
|
-
continue;
|
|
196
|
-
}
|
|
197
|
-
if (fs.existsSync(fullPath) && !file.overwrite && !opts.force)
|
|
110
|
+
fs.mkdirSync(path.dirname(fullPath), { recursive: true });
|
|
111
|
+
if (fs.existsSync(fullPath) && !opts.force)
|
|
198
112
|
continue;
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
lock.entries[file.path] = { path: file.path, hash: hashContent(file.content), generatedAt: new Date().toISOString(), userModified: false };
|
|
202
|
-
written++;
|
|
203
|
-
}
|
|
204
|
-
catch { }
|
|
113
|
+
fs.writeFileSync(fullPath, file.content, 'utf-8');
|
|
114
|
+
written++;
|
|
205
115
|
}
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
if (skipped > 0)
|
|
209
|
-
console.log(chalk.yellow(` Skipped ${skipped} files (use --force to overwrite)`));
|
|
210
|
-
// Always write config file
|
|
211
|
-
const configOutput = {
|
|
116
|
+
// Write config
|
|
117
|
+
fs.writeFileSync(path.join(outputDir, 'yiyuan.config.json'), JSON.stringify({
|
|
212
118
|
name: project.name,
|
|
213
|
-
description: project.description ?? '',
|
|
214
119
|
version: project.version,
|
|
215
120
|
techStack: project.techStack,
|
|
216
|
-
entities: project.entities.map(e => ({ name: e.name, fields: e.fields })),
|
|
217
121
|
auth: project.auth,
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
// Auto-install all dependencies
|
|
224
|
-
if (opts.install !== false && !opts.only) {
|
|
122
|
+
entities: project.entities.map((e) => ({ name: e.name, fields: e.fields })),
|
|
123
|
+
}, null, 2), 'utf-8');
|
|
124
|
+
spinner.succeed(chalk.green(`Generated ${written} files`));
|
|
125
|
+
// Install deps
|
|
126
|
+
if (opts.install !== false) {
|
|
225
127
|
console.log();
|
|
226
128
|
const isPython = ['fastapi', 'flask', 'django'].includes(ts.backend);
|
|
227
129
|
const isGo = ['gin', 'fiber'].includes(ts.backend);
|
|
228
|
-
const termux = isTermux();
|
|
229
|
-
// JS/TS server
|
|
230
130
|
if (!isPython && !isGo && fs.existsSync(path.join(outputDir, 'server/package.json'))) {
|
|
231
131
|
const s = ora('Server deps...').start();
|
|
232
132
|
try {
|
|
233
|
-
await
|
|
133
|
+
await run('npm', ['install', '--no-optional'], path.join(outputDir, 'server'));
|
|
234
134
|
s.succeed('Done');
|
|
235
135
|
}
|
|
236
136
|
catch (e) {
|
|
237
137
|
s.warn(e.message);
|
|
238
138
|
}
|
|
239
139
|
}
|
|
240
|
-
// Python
|
|
241
140
|
if (isPython) {
|
|
242
|
-
|
|
243
|
-
if (
|
|
244
|
-
try {
|
|
245
|
-
execSync('python -m uvicorn --version', { stdio: 'ignore', timeout: 3000 });
|
|
246
|
-
}
|
|
247
|
-
catch {
|
|
248
|
-
console.log(chalk.cyan(' Installing uvicorn...'));
|
|
249
|
-
runSync('pip install uvicorn');
|
|
250
|
-
}
|
|
251
|
-
}
|
|
252
|
-
const req = [path.join(outputDir, 'server/requirements.txt'), path.join(outputDir, 'requirements.txt')].find(f => fs.existsSync(f));
|
|
253
|
-
if (req) {
|
|
141
|
+
const req = path.join(outputDir, 'server/requirements.txt');
|
|
142
|
+
if (fs.existsSync(req)) {
|
|
254
143
|
const s = ora('Python deps...').start();
|
|
255
144
|
try {
|
|
256
|
-
await
|
|
145
|
+
await run('pip', ['install', '-r', req], path.join(outputDir, 'server'));
|
|
257
146
|
s.succeed('Done');
|
|
258
147
|
}
|
|
259
148
|
catch (e) {
|
|
@@ -261,33 +150,34 @@ export const generateCommand = new Command('generate')
|
|
|
261
150
|
}
|
|
262
151
|
}
|
|
263
152
|
}
|
|
264
|
-
// Go
|
|
265
153
|
if (isGo && fs.existsSync(path.join(outputDir, 'server/go.mod'))) {
|
|
266
154
|
const s = ora('Go deps...').start();
|
|
267
155
|
try {
|
|
268
|
-
await
|
|
156
|
+
await run('go', ['mod', 'tidy'], path.join(outputDir, 'server'));
|
|
269
157
|
s.succeed('Done');
|
|
270
158
|
}
|
|
271
159
|
catch (e) {
|
|
272
160
|
s.warn(e.message);
|
|
273
161
|
}
|
|
274
162
|
}
|
|
275
|
-
|
|
276
|
-
if (isJsFrontend && fs.existsSync(path.join(outputDir, 'frontend/package.json'))) {
|
|
163
|
+
if (fs.existsSync(path.join(outputDir, 'frontend/package.json'))) {
|
|
277
164
|
const s = ora('Frontend deps...').start();
|
|
278
165
|
try {
|
|
279
|
-
await
|
|
166
|
+
await run('npm', ['install', '--no-optional'], path.join(outputDir, 'frontend'));
|
|
280
167
|
s.succeed('Done');
|
|
281
168
|
}
|
|
282
169
|
catch (e) {
|
|
283
170
|
s.warn(e.message);
|
|
284
171
|
}
|
|
285
172
|
}
|
|
286
|
-
|
|
287
|
-
if (!isPython && !isGo && ts.database === 'prisma' && fs.existsSync(path.join(outputDir, 'prisma/schema.prisma'))) {
|
|
173
|
+
if (ts.database === 'prisma' && fs.existsSync(path.join(outputDir, 'prisma/schema.prisma'))) {
|
|
288
174
|
const s = ora('Prisma client...').start();
|
|
289
175
|
try {
|
|
290
|
-
|
|
176
|
+
const bin = path.join(outputDir, 'server/node_modules/.bin/prisma');
|
|
177
|
+
if (fs.existsSync(bin))
|
|
178
|
+
await run(bin, ['generate'], path.join(outputDir, 'server'));
|
|
179
|
+
else
|
|
180
|
+
await run('npx', ['prisma', 'generate'], path.join(outputDir, 'server'));
|
|
291
181
|
s.succeed('Done');
|
|
292
182
|
}
|
|
293
183
|
catch (e) {
|
|
@@ -297,8 +187,8 @@ export const generateCommand = new Command('generate')
|
|
|
297
187
|
}
|
|
298
188
|
console.log();
|
|
299
189
|
}
|
|
300
|
-
catch (
|
|
301
|
-
spinner.fail(chalk.red(`
|
|
190
|
+
catch (e) {
|
|
191
|
+
spinner.fail(chalk.red(`Failed: ${e.message}\n`));
|
|
302
192
|
process.exit(1);
|
|
303
193
|
}
|
|
304
194
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate.js","sourceRoot":"","sources":["../../src/commands/generate.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"generate.js","sourceRoot":"","sources":["../../src/commands/generate.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "yiyuanjs",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.16",
|
|
4
4
|
"description": "AI-powered full-stack code generation framework - from requirements to code in one command",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"bin": {
|
|
@@ -55,7 +55,7 @@
|
|
|
55
55
|
"README.md"
|
|
56
56
|
],
|
|
57
57
|
"dependencies": {
|
|
58
|
-
"yiyuanjs-core": "
|
|
58
|
+
"yiyuanjs-core": "workspace:*",
|
|
59
59
|
"chalk": "^5.3.0",
|
|
60
60
|
"commander": "^12.1.0",
|
|
61
61
|
"dotenv": "^16.4.0",
|