@mpis/run 0.0.28 → 0.0.30
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/lib/bin.js +14 -8
- package/lib/bin.js.map +1 -1
- package/lib/common/config-file.js +15 -15
- package/lib/common/config-file.js.map +1 -1
- package/package.json +16 -16
- package/src/bin.ts +16 -8
- package/src/common/config-file.ts +15 -15
- package/src/tsconfig.json +9 -6
package/lib/bin.js
CHANGED
|
@@ -6,6 +6,7 @@ import { channelClient } from '@mpis/client';
|
|
|
6
6
|
import { ProcessIPCClient } from '@mpis/server';
|
|
7
7
|
import assert from 'node:assert/strict';
|
|
8
8
|
import { rmSync } from 'node:fs';
|
|
9
|
+
import { basename, dirname, sep } from 'node:path';
|
|
9
10
|
import { inspect } from 'node:util';
|
|
10
11
|
import { dumpConfig } from './commands/config.js';
|
|
11
12
|
import { context, initializeLogger } from './common/args.js';
|
|
@@ -120,35 +121,40 @@ function executeClean() {
|
|
|
120
121
|
}
|
|
121
122
|
logger.success `Cleaned up ${config.clean.length} folders.`;
|
|
122
123
|
}
|
|
124
|
+
function colorfulName(path) {
|
|
125
|
+
const dir = dirname(path);
|
|
126
|
+
const base = basename(path);
|
|
127
|
+
return `\x1B[2m${dir || '???'}\x1B[0m${sep}\x1B[38;5;2m${base}\x1B[0m`;
|
|
128
|
+
}
|
|
123
129
|
function printFailedRunError(worker, message) {
|
|
124
130
|
terminal.resetIf(context().watchMode && !logger.debug.isEnabled);
|
|
125
131
|
let text = worker.outputStream.toString().trimEnd().replace(cls, '');
|
|
126
132
|
if (!text) {
|
|
127
|
-
text =
|
|
133
|
+
text = `工作进程 "${worker._id}" 没有任何输出`;
|
|
128
134
|
text = inspect(worker, { colors: true });
|
|
129
135
|
}
|
|
130
|
-
console.error('\n\x1B[48;5;1m%s\r\x1B[48;5;1m \x1B[0;38;5;9;1m %s \x1B[0m', ' '.repeat(process.stderr.columns || 80), `[@mpis/run]
|
|
131
|
-
console.error('\x1B[48;5;1m \x1B[0m commandline: %s', worker.commandline.join(' '));
|
|
136
|
+
console.error('\n\x1B[48;5;1m%s\r\x1B[48;5;1m \x1B[0;38;5;9;1m %s \x1B[0m', ' '.repeat(process.stderr.columns || 80), `[@mpis/run] 以下是 "${worker._id}" 的输出`);
|
|
137
|
+
console.error('\x1B[48;5;1m \x1B[0m commandline: %s %s', colorfulName(worker.commandline[0] ?? ''), worker.commandline.slice(1).join(' '));
|
|
132
138
|
console.error('\x1B[48;5;1m \x1B[0m workdir: %s', worker.cwd);
|
|
133
139
|
let specialState = '';
|
|
134
140
|
if (worker.targetState.signal) {
|
|
135
|
-
specialState =
|
|
141
|
+
specialState = `目标被信号 ${worker.targetState.signal} 杀死`;
|
|
136
142
|
}
|
|
137
143
|
else if (worker.targetState.exitCode) {
|
|
138
|
-
specialState =
|
|
144
|
+
specialState = `目标以代码 ${worker.targetState.exitCode} 退出`;
|
|
139
145
|
}
|
|
140
146
|
else if (!worker.targetState.failedExecute) {
|
|
141
|
-
specialState =
|
|
147
|
+
specialState = `目标启动失败`;
|
|
142
148
|
}
|
|
143
149
|
else if (!worker.targetState.started) {
|
|
144
|
-
specialState =
|
|
150
|
+
specialState = `目标无法启动`;
|
|
145
151
|
}
|
|
146
152
|
if (specialState) {
|
|
147
153
|
console.error('\x1B[48;5;1m \x1B[0;38;5;11m \u26A0 %s\x1b[0m', specialState);
|
|
148
154
|
}
|
|
149
155
|
console.error('');
|
|
150
156
|
console.error(text.trim());
|
|
151
|
-
console.error('\n\x1B[48;5;1m%s\r\x1B[48;5;1m \x1B[0;38;5;9;1m %s \x1B[0m', ' '.repeat(process.stderr.columns || 80), `[@mpis/run]
|
|
157
|
+
console.error('\n\x1B[48;5;1m%s\r\x1B[48;5;1m \x1B[0;38;5;9;1m %s \x1B[0m', ' '.repeat(process.stderr.columns || 80), `[@mpis/run] 结束 "${worker._id}" 的输出`);
|
|
152
158
|
const graph = workersManager.finalize();
|
|
153
159
|
console.error('%s\n%s', graph.debugFormatGraph(), graph.debugFormatSummary());
|
|
154
160
|
logger.error `"${worker._id}" ${message}`;
|
package/lib/bin.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bin.js","sourceRoot":"","sources":["../src/bin.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"bin.js","sourceRoot":"","sources":["../src/bin.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,7 +14,7 @@ function watchModeCmd(command, watch, watchMode) {
|
|
|
14
14
|
return cmdArr;
|
|
15
15
|
}
|
|
16
16
|
if (typeof watch === 'boolean') {
|
|
17
|
-
throw new Error(
|
|
17
|
+
throw new Error(`无效的 watch 值: ${watch}. 期望的是字符串或数组`);
|
|
18
18
|
}
|
|
19
19
|
if (!watch)
|
|
20
20
|
watch = ['-w'];
|
|
@@ -24,7 +24,7 @@ function loadConfigFile(watchMode) {
|
|
|
24
24
|
const config = new ProjectConfig(projectRoot, undefined, logger);
|
|
25
25
|
const schemaFile = resolve(selfRoot, 'commands.schema.json');
|
|
26
26
|
const configFile = config.getJsonConfigInfo('commands');
|
|
27
|
-
logger.debug
|
|
27
|
+
logger.debug `使用配置文件: long<${configFile.effective}>`;
|
|
28
28
|
const input = config.loadBothJson('commands', schemaFile, {
|
|
29
29
|
array(left, right, keyPath) {
|
|
30
30
|
switch (keyPath[0]) {
|
|
@@ -61,8 +61,8 @@ function loadConfigFile(watchMode) {
|
|
|
61
61
|
if (info.rig.exists) {
|
|
62
62
|
files.push(info.rig.path);
|
|
63
63
|
}
|
|
64
|
-
logger.info
|
|
65
|
-
logger.error
|
|
64
|
+
logger.info `配置文件list<${files}>`;
|
|
65
|
+
logger.error `命令 ${input.build.indexOf(item)}"${item}" 不在"commands"中 list<${Object.keys(input.commands)}>`;
|
|
66
66
|
shutdown(ExitCode.USAGE);
|
|
67
67
|
}
|
|
68
68
|
item = found;
|
|
@@ -80,12 +80,12 @@ function loadConfigFile(watchMode) {
|
|
|
80
80
|
debug_title = item.command.package;
|
|
81
81
|
}
|
|
82
82
|
}
|
|
83
|
-
logger.log
|
|
83
|
+
logger.log `命令"${debug_title}"被设置了watch=false,跳过执行`;
|
|
84
84
|
continue;
|
|
85
85
|
}
|
|
86
86
|
const cmd = resolveCommand(config, item, watchMode);
|
|
87
87
|
if (buildMap.has(cmd.title)) {
|
|
88
|
-
throw new Error(
|
|
88
|
+
throw new Error(`命令"${cmd.title}"重复,请在继续之前重命名它`);
|
|
89
89
|
}
|
|
90
90
|
buildMap.set(cmd.title, cmd);
|
|
91
91
|
buildTitles.push(cmd.title);
|
|
@@ -102,7 +102,7 @@ function loadConfigFile(watchMode) {
|
|
|
102
102
|
if (config.rigConfig.rigFound) {
|
|
103
103
|
const nmPath = findUpUntilSync({ file: 'node_modules', from: config.rigConfig.getResolvedProfileFolder() });
|
|
104
104
|
if (!nmPath) {
|
|
105
|
-
throw new Error(
|
|
105
|
+
throw new Error(`在 rig 配置 "${config.rigConfig.getResolvedProfileFolder()}" 中未找到 "node_modules" 文件夹`);
|
|
106
106
|
}
|
|
107
107
|
additionalPaths.push(resolve(nmPath, '.bin'));
|
|
108
108
|
}
|
|
@@ -110,7 +110,7 @@ function loadConfigFile(watchMode) {
|
|
|
110
110
|
for (const item of input.clean) {
|
|
111
111
|
const abs = resolve(projectRoot, item);
|
|
112
112
|
if (!abs.startsWith(projectRoot)) {
|
|
113
|
-
throw new Error(
|
|
113
|
+
throw new Error(`无效的清理路径"${item}",超出项目范围 "${projectRoot}"`);
|
|
114
114
|
}
|
|
115
115
|
clean.push(abs);
|
|
116
116
|
}
|
|
@@ -139,7 +139,7 @@ function resolveCommand(config, input, watchMode) {
|
|
|
139
139
|
return obj;
|
|
140
140
|
}
|
|
141
141
|
else {
|
|
142
|
-
throw TypeError(
|
|
142
|
+
throw TypeError(`无效的命令类型: ${typeof cmd}。期望的类型是字符串、数组或对象`);
|
|
143
143
|
}
|
|
144
144
|
}
|
|
145
145
|
function guessTitle(command) {
|
|
@@ -149,7 +149,7 @@ function guessTitle(command) {
|
|
|
149
149
|
if (Array.isArray(command)) {
|
|
150
150
|
return command[0];
|
|
151
151
|
}
|
|
152
|
-
throw new Error(
|
|
152
|
+
throw new Error(`无效的命令: ${Array.isArray(command) ? command.join(' ') : command}`);
|
|
153
153
|
}
|
|
154
154
|
function parsePackagedBinary(config, item, watchMode) {
|
|
155
155
|
const cmd = item.command;
|
|
@@ -167,10 +167,10 @@ function parsePackagedBinary(config, item, watchMode) {
|
|
|
167
167
|
const typeStr = typeof pkg.bin === 'string';
|
|
168
168
|
const typeMap = !!cmd.binary;
|
|
169
169
|
if (typeStr && typeMap) {
|
|
170
|
-
throw new Error(`"${pkgJsonPath}"
|
|
170
|
+
throw new Error(`"${pkgJsonPath}"中的"bin"字段是字符串,不能在"commands.json" 中指定"binary"`);
|
|
171
171
|
}
|
|
172
172
|
else if (!typeStr && !typeMap) {
|
|
173
|
-
throw new Error(`"${pkgJsonPath}"
|
|
173
|
+
throw new Error(`"${pkgJsonPath}"中的"bin"字段不是字符串,必须在"commands.json"中指定"binary"`);
|
|
174
174
|
}
|
|
175
175
|
let binPath;
|
|
176
176
|
const binVal = typeStr ? pkg.bin : pkg.bin[cmd.binary];
|
|
@@ -183,11 +183,11 @@ function parsePackagedBinary(config, item, watchMode) {
|
|
|
183
183
|
binPath = path;
|
|
184
184
|
}
|
|
185
185
|
else {
|
|
186
|
-
throw new Error(`"${pkgJsonPath}"
|
|
186
|
+
throw new Error(`"${pkgJsonPath}"中的"bin"字段没有键"${cmd.binary}";并且"${path}"看起来不像是一个文件`);
|
|
187
187
|
}
|
|
188
188
|
}
|
|
189
189
|
else {
|
|
190
|
-
throw new Error(`"${pkgJsonPath}"
|
|
190
|
+
throw new Error(`"${pkgJsonPath}"中的"bin"字段没有"${cmd.binary}"键`);
|
|
191
191
|
}
|
|
192
192
|
return {
|
|
193
193
|
title: title,
|
|
@@ -215,6 +215,6 @@ function resolveCommandIsFile(config, command) {
|
|
|
215
215
|
export let config;
|
|
216
216
|
export function loadConfig() {
|
|
217
217
|
config = loadConfigFile(context().watchMode);
|
|
218
|
-
logger.verbose
|
|
218
|
+
logger.verbose `成功加载配置文件: ${config}`;
|
|
219
219
|
}
|
|
220
220
|
//# sourceMappingURL=config-file.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config-file.js","sourceRoot":"","sources":["../../src/common/config-file.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,uCAAuC,CAAC;AACtE,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAC3C,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AACzC,OAAO,EAAE,eAAe,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAC1D,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACnD,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EAAE,KAAK,IAAI,QAAQ,EAAE,MAAM,WAAW,CAAC;AAC9C,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAmCnD,SAAS,YAAY,CAAC,OAAmC,EAAE,KAA4C,EAAE,SAAmB;IAC3H,MAAM,MAAM,GAAG,OAAO,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;IAEzE,IAAI,CAAC,SAAS,EAAE,CAAC;QAChB,OAAO,MAAM,CAAC;IACf,CAAC;IACD,IAAI,OAAO,KAAK,KAAK,SAAS,EAAE,CAAC;QAChC,MAAM,IAAI,KAAK,CAAC,
|
|
1
|
+
{"version":3,"file":"config-file.js","sourceRoot":"","sources":["../../src/common/config-file.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,39 +1,39 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@mpis/run",
|
|
3
3
|
"type": "module",
|
|
4
|
-
"version": "0.0.
|
|
4
|
+
"version": "0.0.30",
|
|
5
5
|
"keywords": [],
|
|
6
|
+
"license": "MIT",
|
|
7
|
+
"author": "GongT <admin@gongt.me>",
|
|
8
|
+
"exports": {
|
|
9
|
+
"./package.json": "./package.json"
|
|
10
|
+
},
|
|
6
11
|
"bin": {
|
|
7
12
|
"run": "./loader/bin.js",
|
|
8
13
|
"mpis-run": "./loader/bin.js"
|
|
9
14
|
},
|
|
10
|
-
"exports": {
|
|
11
|
-
"./package.json": "./package.json"
|
|
12
|
-
},
|
|
13
15
|
"dependencies": {
|
|
14
16
|
"split-cmd": "^1.1.0",
|
|
15
|
-
"@build-script/rushstack-config-loader": "^0.0.
|
|
16
|
-
"@idlebox/args": "^0.0.
|
|
17
|
-
"@idlebox/common": "^1.5.
|
|
18
|
-
"@idlebox/logger": "^0.0.
|
|
19
|
-
"@idlebox/node": "^1.4.
|
|
20
|
-
"@mpis/client": "^0.0.
|
|
21
|
-
"@mpis/server": "^0.0.
|
|
22
|
-
"@idlebox/source-map-support": "^0.0.
|
|
23
|
-
"@idlebox/terminal-control": "^0.0.
|
|
17
|
+
"@build-script/rushstack-config-loader": "^0.0.41",
|
|
18
|
+
"@idlebox/args": "^0.0.28",
|
|
19
|
+
"@idlebox/common": "^1.5.28",
|
|
20
|
+
"@idlebox/logger": "^0.0.27",
|
|
21
|
+
"@idlebox/node": "^1.4.37",
|
|
22
|
+
"@mpis/client": "^0.0.24",
|
|
23
|
+
"@mpis/server": "^0.0.24",
|
|
24
|
+
"@idlebox/source-map-support": "^0.0.23",
|
|
25
|
+
"@idlebox/terminal-control": "^0.0.6"
|
|
24
26
|
},
|
|
25
27
|
"devDependencies": {
|
|
26
28
|
"@types/node": "^25.5.0",
|
|
27
29
|
"@build-script/baseline-rig": "latest"
|
|
28
30
|
},
|
|
29
|
-
"sideEffects": false,
|
|
30
|
-
"license": "MIT",
|
|
31
|
-
"author": "GongT <admin@gongt.me>",
|
|
32
31
|
"repository": {
|
|
33
32
|
"type": "git",
|
|
34
33
|
"url": "git+https://github.com/GongT/baobao.git",
|
|
35
34
|
"directory": "@mpis/run"
|
|
36
35
|
},
|
|
36
|
+
"sideEffects": false,
|
|
37
37
|
"scripts": {
|
|
38
38
|
"build": "node loader/bin.devel.js build",
|
|
39
39
|
"watch": "node loader/bin.devel.js watch",
|
package/src/bin.ts
CHANGED
|
@@ -6,6 +6,7 @@ import { channelClient } from '@mpis/client';
|
|
|
6
6
|
import { ProcessIPCClient } from '@mpis/server';
|
|
7
7
|
import assert from 'node:assert/strict';
|
|
8
8
|
import { rmSync } from 'node:fs';
|
|
9
|
+
import { basename, dirname, sep } from 'node:path';
|
|
9
10
|
import { inspect } from 'node:util';
|
|
10
11
|
import { dumpConfig } from './commands/config.js';
|
|
11
12
|
import { context, initializeLogger } from './common/args.js';
|
|
@@ -143,34 +144,41 @@ function executeClean() {
|
|
|
143
144
|
logger.success`Cleaned up ${config.clean.length} folders.`;
|
|
144
145
|
}
|
|
145
146
|
|
|
147
|
+
function colorfulName(path: string) {
|
|
148
|
+
const dir = dirname(path);
|
|
149
|
+
const base = basename(path);
|
|
150
|
+
|
|
151
|
+
return `\x1B[2m${dir || '???'}\x1B[0m${sep}\x1B[38;5;2m${base}\x1B[0m`;
|
|
152
|
+
}
|
|
153
|
+
|
|
146
154
|
function printFailedRunError(worker: ProcessIPCClient, message: string) {
|
|
147
155
|
terminal.resetIf(context().watchMode && !logger.debug.isEnabled);
|
|
148
156
|
|
|
149
157
|
let text = worker.outputStream.toString().trimEnd().replace(cls, '');
|
|
150
158
|
|
|
151
159
|
if (!text) {
|
|
152
|
-
text =
|
|
160
|
+
text = `工作进程 "${worker._id}" 没有任何输出`;
|
|
153
161
|
text = inspect(worker, { colors: true });
|
|
154
162
|
}
|
|
155
163
|
|
|
156
164
|
console.error(
|
|
157
165
|
'\n\x1B[48;5;1m%s\r\x1B[48;5;1m \x1B[0;38;5;9;1m %s \x1B[0m',
|
|
158
166
|
' '.repeat(process.stderr.columns || 80),
|
|
159
|
-
`[@mpis/run]
|
|
167
|
+
`[@mpis/run] 以下是 "${worker._id}" 的输出`,
|
|
160
168
|
);
|
|
161
169
|
|
|
162
|
-
console.error('\x1B[48;5;1m \x1B[0m commandline: %s', worker.commandline.join(' '));
|
|
170
|
+
console.error('\x1B[48;5;1m \x1B[0m commandline: %s %s', colorfulName(worker.commandline[0] ?? ''), worker.commandline.slice(1).join(' '));
|
|
163
171
|
console.error('\x1B[48;5;1m \x1B[0m workdir: %s', worker.cwd);
|
|
164
172
|
|
|
165
173
|
let specialState = '';
|
|
166
174
|
if (worker.targetState.signal) {
|
|
167
|
-
specialState =
|
|
175
|
+
specialState = `目标被信号 ${worker.targetState.signal} 杀死`;
|
|
168
176
|
} else if (worker.targetState.exitCode) {
|
|
169
|
-
specialState =
|
|
177
|
+
specialState = `目标以代码 ${worker.targetState.exitCode} 退出`;
|
|
170
178
|
} else if (!worker.targetState.failedExecute) {
|
|
171
|
-
specialState =
|
|
179
|
+
specialState = `目标启动失败`;
|
|
172
180
|
} else if (!worker.targetState.started) {
|
|
173
|
-
specialState =
|
|
181
|
+
specialState = `目标无法启动`;
|
|
174
182
|
}
|
|
175
183
|
if (specialState) {
|
|
176
184
|
console.error('\x1B[48;5;1m \x1B[0;38;5;11m \u26A0 %s\x1b[0m', specialState);
|
|
@@ -182,7 +190,7 @@ function printFailedRunError(worker: ProcessIPCClient, message: string) {
|
|
|
182
190
|
console.error(
|
|
183
191
|
'\n\x1B[48;5;1m%s\r\x1B[48;5;1m \x1B[0;38;5;9;1m %s \x1B[0m',
|
|
184
192
|
' '.repeat(process.stderr.columns || 80),
|
|
185
|
-
`[@mpis/run]
|
|
193
|
+
`[@mpis/run] 结束 "${worker._id}" 的输出`,
|
|
186
194
|
);
|
|
187
195
|
|
|
188
196
|
const graph = workersManager.finalize();
|
|
@@ -49,7 +49,7 @@ function watchModeCmd(command: string | readonly string[], watch?: string | read
|
|
|
49
49
|
return cmdArr;
|
|
50
50
|
}
|
|
51
51
|
if (typeof watch === 'boolean') {
|
|
52
|
-
throw new Error(
|
|
52
|
+
throw new Error(`无效的 watch 值: ${watch}. 期望的是字符串或数组`);
|
|
53
53
|
}
|
|
54
54
|
|
|
55
55
|
if (!watch) watch = ['-w'];
|
|
@@ -61,7 +61,7 @@ function loadConfigFile(watchMode: boolean): IConfigFile {
|
|
|
61
61
|
const schemaFile = resolve(selfRoot, 'commands.schema.json');
|
|
62
62
|
|
|
63
63
|
const configFile = config.getJsonConfigInfo('commands');
|
|
64
|
-
logger.debug
|
|
64
|
+
logger.debug`使用配置文件: long<${configFile.effective}>`;
|
|
65
65
|
|
|
66
66
|
const input: IConfigFileInput = config.loadBothJson('commands', schemaFile, {
|
|
67
67
|
array(left, right, keyPath) {
|
|
@@ -100,8 +100,8 @@ function loadConfigFile(watchMode: boolean): IConfigFile {
|
|
|
100
100
|
if (info.rig.exists) {
|
|
101
101
|
files.push(info.rig.path);
|
|
102
102
|
}
|
|
103
|
-
logger.info
|
|
104
|
-
logger.error
|
|
103
|
+
logger.info`配置文件list<${files}>`;
|
|
104
|
+
logger.error`命令 ${input.build.indexOf(item)}"${item}" 不在"commands"中 list<${Object.keys(input.commands)}>`;
|
|
105
105
|
shutdown(ExitCode.USAGE);
|
|
106
106
|
}
|
|
107
107
|
item = found;
|
|
@@ -118,14 +118,14 @@ function loadConfigFile(watchMode: boolean): IConfigFile {
|
|
|
118
118
|
debug_title = item.command.package;
|
|
119
119
|
}
|
|
120
120
|
}
|
|
121
|
-
logger.log
|
|
121
|
+
logger.log`命令"${debug_title}"被设置了watch=false,跳过执行`;
|
|
122
122
|
continue;
|
|
123
123
|
}
|
|
124
124
|
|
|
125
125
|
const cmd = resolveCommand(config, item, watchMode);
|
|
126
126
|
|
|
127
127
|
if (buildMap.has(cmd.title)) {
|
|
128
|
-
throw new Error(
|
|
128
|
+
throw new Error(`命令"${cmd.title}"重复,请在继续之前重命名它`);
|
|
129
129
|
}
|
|
130
130
|
buildMap.set(cmd.title, cmd);
|
|
131
131
|
buildTitles.push(cmd.title);
|
|
@@ -145,7 +145,7 @@ function loadConfigFile(watchMode: boolean): IConfigFile {
|
|
|
145
145
|
if (config.rigConfig.rigFound) {
|
|
146
146
|
const nmPath = findUpUntilSync({ file: 'node_modules', from: config.rigConfig.getResolvedProfileFolder() });
|
|
147
147
|
if (!nmPath) {
|
|
148
|
-
throw new Error(
|
|
148
|
+
throw new Error(`在 rig 配置 "${config.rigConfig.getResolvedProfileFolder()}" 中未找到 "node_modules" 文件夹`);
|
|
149
149
|
}
|
|
150
150
|
additionalPaths.push(resolve(nmPath, '.bin'));
|
|
151
151
|
}
|
|
@@ -154,7 +154,7 @@ function loadConfigFile(watchMode: boolean): IConfigFile {
|
|
|
154
154
|
for (const item of input.clean) {
|
|
155
155
|
const abs = resolve(projectRoot, item);
|
|
156
156
|
if (!abs.startsWith(projectRoot)) {
|
|
157
|
-
throw new Error(
|
|
157
|
+
throw new Error(`无效的清理路径"${item}",超出项目范围 "${projectRoot}"`);
|
|
158
158
|
}
|
|
159
159
|
clean.push(abs);
|
|
160
160
|
}
|
|
@@ -183,7 +183,7 @@ function resolveCommand(config: ProjectConfig, input: ICommandInput, watchMode:
|
|
|
183
183
|
const obj = parsePackagedBinary(config, input, watchMode);
|
|
184
184
|
return obj;
|
|
185
185
|
} else {
|
|
186
|
-
throw TypeError(
|
|
186
|
+
throw TypeError(`无效的命令类型: ${typeof cmd}。期望的类型是字符串、数组或对象`);
|
|
187
187
|
}
|
|
188
188
|
}
|
|
189
189
|
|
|
@@ -195,7 +195,7 @@ function guessTitle(command: string | readonly string[]): string {
|
|
|
195
195
|
return command[0];
|
|
196
196
|
}
|
|
197
197
|
|
|
198
|
-
throw new Error(
|
|
198
|
+
throw new Error(`无效的命令: ${Array.isArray(command) ? command.join(' ') : command}`);
|
|
199
199
|
}
|
|
200
200
|
|
|
201
201
|
function parsePackagedBinary(config: ProjectConfig, item: ICommandInput, watchMode: boolean): ICommand {
|
|
@@ -216,9 +216,9 @@ function parsePackagedBinary(config: ProjectConfig, item: ICommandInput, watchMo
|
|
|
216
216
|
const typeStr = typeof pkg.bin === 'string';
|
|
217
217
|
const typeMap = !!cmd.binary;
|
|
218
218
|
if (typeStr && typeMap) {
|
|
219
|
-
throw new Error(`"${pkgJsonPath}"
|
|
219
|
+
throw new Error(`"${pkgJsonPath}"中的"bin"字段是字符串,不能在"commands.json" 中指定"binary"`);
|
|
220
220
|
} else if (!typeStr && !typeMap) {
|
|
221
|
-
throw new Error(`"${pkgJsonPath}"
|
|
221
|
+
throw new Error(`"${pkgJsonPath}"中的"bin"字段不是字符串,必须在"commands.json"中指定"binary"`);
|
|
222
222
|
}
|
|
223
223
|
|
|
224
224
|
let binPath: string;
|
|
@@ -230,10 +230,10 @@ function parsePackagedBinary(config: ProjectConfig, item: ICommandInput, watchMo
|
|
|
230
230
|
if (existsSync(path)) {
|
|
231
231
|
binPath = path;
|
|
232
232
|
} else {
|
|
233
|
-
throw new Error(`"${pkgJsonPath}"
|
|
233
|
+
throw new Error(`"${pkgJsonPath}"中的"bin"字段没有键"${cmd.binary}";并且"${path}"看起来不像是一个文件`);
|
|
234
234
|
}
|
|
235
235
|
} else {
|
|
236
|
-
throw new Error(`"${pkgJsonPath}"
|
|
236
|
+
throw new Error(`"${pkgJsonPath}"中的"bin"字段没有"${cmd.binary}"键`);
|
|
237
237
|
}
|
|
238
238
|
|
|
239
239
|
return {
|
|
@@ -266,5 +266,5 @@ function resolveCommandIsFile(config: ProjectConfig, command: string[]) {
|
|
|
266
266
|
export let config: IConfigFile;
|
|
267
267
|
export function loadConfig() {
|
|
268
268
|
config = loadConfigFile(context().watchMode);
|
|
269
|
-
logger.verbose
|
|
269
|
+
logger.verbose`成功加载配置文件: ${config}`;
|
|
270
270
|
}
|
package/src/tsconfig.json
CHANGED
|
@@ -1,8 +1,11 @@
|
|
|
1
1
|
{
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
2
|
+
"extends": "@build-script/baseline-rig/package/tsconfig.json",
|
|
3
|
+
"compilerOptions": {
|
|
4
|
+
"typeRoots": [
|
|
5
|
+
"../node_modules/@types",
|
|
6
|
+
"../node_modules"
|
|
7
|
+
],
|
|
8
|
+
"outDir": "../lib",
|
|
9
|
+
"rootDir": "./"
|
|
10
|
+
}
|
|
8
11
|
}
|