@plugjs/plug 0.2.6 → 0.2.7
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/cli/plug.mjs +3 -15
- package/cli/ts-loader.mjs +1 -1
- package/cli/tsrun.mjs +1104 -36
- package/dist/asserts.cjs +4 -0
- package/dist/asserts.cjs.map +1 -1
- package/dist/asserts.mjs +4 -0
- package/dist/asserts.mjs.map +1 -1
- package/dist/fork.cjs +8 -5
- package/dist/fork.cjs.map +1 -1
- package/dist/fork.mjs +8 -5
- package/dist/fork.mjs.map +1 -1
- package/dist/helpers.cjs +20 -0
- package/dist/helpers.cjs.map +1 -1
- package/dist/helpers.d.ts +6 -0
- package/dist/helpers.mjs +20 -1
- package/dist/helpers.mjs.map +1 -1
- package/dist/logging/emit.cjs +4 -7
- package/dist/logging/emit.cjs.map +1 -1
- package/dist/logging/emit.mjs +4 -7
- package/dist/logging/emit.mjs.map +1 -1
- package/dist/logging/github.cjs +63 -0
- package/dist/logging/github.cjs.map +6 -0
- package/dist/logging/github.d.ts +13 -0
- package/dist/logging/github.mjs +38 -0
- package/dist/logging/github.mjs.map +6 -0
- package/dist/logging/options.cjs +20 -3
- package/dist/logging/options.cjs.map +1 -1
- package/dist/logging/options.d.ts +9 -2
- package/dist/logging/options.mjs +20 -3
- package/dist/logging/options.mjs.map +1 -1
- package/dist/logging/report.cjs +25 -3
- package/dist/logging/report.cjs.map +1 -1
- package/dist/logging/report.mjs +26 -4
- package/dist/logging/report.mjs.map +1 -1
- package/dist/logging.cjs +1 -0
- package/dist/logging.cjs.map +1 -1
- package/dist/logging.d.ts +1 -0
- package/dist/logging.mjs +1 -0
- package/dist/logging.mjs.map +1 -1
- package/dist/utils/exec.cjs +20 -13
- package/dist/utils/exec.cjs.map +2 -2
- package/dist/utils/exec.mjs +21 -14
- package/dist/utils/exec.mjs.map +1 -1
- package/extra/plug.mts +6 -3
- package/extra/tsrun.mts +91 -28
- package/extra/utils.ts +0 -18
- package/package.json +1 -1
- package/src/asserts.ts +7 -0
- package/src/fork.ts +10 -5
- package/src/helpers.ts +24 -1
- package/src/logging/emit.ts +2 -7
- package/src/logging/github.ts +71 -0
- package/src/logging/options.ts +29 -4
- package/src/logging/report.ts +40 -6
- package/src/logging.ts +1 -0
- package/src/utils/exec.ts +29 -18
|
@@ -23,6 +23,8 @@ export interface LogOptions {
|
|
|
23
23
|
showSources: boolean;
|
|
24
24
|
/** The task name to be used by default if a task is not contextualized. */
|
|
25
25
|
defaultTaskName: string;
|
|
26
|
+
/** Whether GitHub annotations are enabled or not. */
|
|
27
|
+
githubAnnotations: boolean;
|
|
26
28
|
/** The options used by NodeJS for object inspection. */
|
|
27
29
|
readonly inspectOptions: InspectOptions;
|
|
28
30
|
/** Set an inspect option in {@link LogOptions.inspectOptions}). */
|
|
@@ -33,8 +35,13 @@ export interface LogOptions {
|
|
|
33
35
|
once(eventName: 'changed', listener: (logOptions: this) => void): this;
|
|
34
36
|
/** Remove an event listener for the specified event. */
|
|
35
37
|
off(eventName: 'changed', listener: (logOptions: this) => void): this;
|
|
36
|
-
/**
|
|
37
|
-
|
|
38
|
+
/**
|
|
39
|
+
* Return a record of environment variables for forking.
|
|
40
|
+
*
|
|
41
|
+
* @param taskName The default task name of the forked process
|
|
42
|
+
* @param logFd A file descriptor where logs should be sinked to
|
|
43
|
+
*/
|
|
44
|
+
forkEnv(taskName?: string, logFd?: number): Record<string, string>;
|
|
38
45
|
}
|
|
39
46
|
/** Shared instance of our {@link LogOptions}. */
|
|
40
47
|
export declare const logOptions: LogOptions;
|
package/dist/logging/options.mjs
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
// logging/options.ts
|
|
2
2
|
import { EventEmitter } from "node:events";
|
|
3
|
+
import { Socket } from "node:net";
|
|
3
4
|
import { getLevelNumber, NOTICE } from "./levels.mjs";
|
|
4
5
|
var LogOptionsImpl = class extends EventEmitter {
|
|
5
6
|
_output = process.stderr;
|
|
@@ -14,6 +15,8 @@ var LogOptionsImpl = class extends EventEmitter {
|
|
|
14
15
|
// has line length been set manually?
|
|
15
16
|
_showSources = true;
|
|
16
17
|
// by default, always show source snippets
|
|
18
|
+
_githubAnnotations = false;
|
|
19
|
+
// ultimately set by the constructor
|
|
17
20
|
_inspectOptions = {};
|
|
18
21
|
_defaultTaskName = "";
|
|
19
22
|
_taskLength = 0;
|
|
@@ -29,21 +32,28 @@ var LogOptionsImpl = class extends EventEmitter {
|
|
|
29
32
|
if (process.env.LOG_COLORS.toLowerCase() === "false")
|
|
30
33
|
this.colors = false;
|
|
31
34
|
}
|
|
32
|
-
|
|
35
|
+
this._githubAnnotations = process.env.GITHUB_ACTIONS === "true";
|
|
36
|
+
const { fd, ...options } = JSON.parse(process.env.__LOG_OPTIONS || "{}");
|
|
37
|
+
if (fd)
|
|
38
|
+
this.output = new Socket({ fd }).unref();
|
|
39
|
+
Object.assign(this, options);
|
|
33
40
|
}
|
|
34
41
|
_notifyListeners() {
|
|
35
42
|
super.emit("changed", this);
|
|
36
43
|
}
|
|
37
|
-
forkEnv(taskName) {
|
|
44
|
+
forkEnv(taskName, fd) {
|
|
38
45
|
return {
|
|
39
46
|
__LOG_OPTIONS: JSON.stringify({
|
|
40
47
|
level: this._level,
|
|
41
48
|
colors: this._colors,
|
|
42
49
|
lineLength: this._lineLength,
|
|
43
50
|
taskLength: this._taskLength,
|
|
51
|
+
githubAnnotations: this.githubAnnotations,
|
|
44
52
|
defaultTaskName: taskName || this._defaultTaskName,
|
|
45
|
-
spinner: false
|
|
53
|
+
spinner: false,
|
|
46
54
|
// forked spinner is always false
|
|
55
|
+
fd
|
|
56
|
+
// file descriptor for logs
|
|
47
57
|
})
|
|
48
58
|
};
|
|
49
59
|
}
|
|
@@ -118,6 +128,13 @@ var LogOptionsImpl = class extends EventEmitter {
|
|
|
118
128
|
this._defaultTaskName = defaultTaskName;
|
|
119
129
|
this._notifyListeners();
|
|
120
130
|
}
|
|
131
|
+
get githubAnnotations() {
|
|
132
|
+
return this._githubAnnotations;
|
|
133
|
+
}
|
|
134
|
+
set githubAnnotations(githubAnnotations) {
|
|
135
|
+
this._githubAnnotations = githubAnnotations;
|
|
136
|
+
this._notifyListeners();
|
|
137
|
+
}
|
|
121
138
|
get inspectOptions() {
|
|
122
139
|
return {
|
|
123
140
|
colors: this._colors,
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/logging/options.ts"],
|
|
4
|
-
"mappings": ";AAAA,SAAS,oBAAoB;
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
package/dist/logging/report.cjs
CHANGED
|
@@ -28,6 +28,13 @@ var import_fs = require("../fs.cjs");
|
|
|
28
28
|
var import_colors = require("./colors.cjs");
|
|
29
29
|
var import_levels = require("./levels.cjs");
|
|
30
30
|
var import_options = require("./options.cjs");
|
|
31
|
+
var import_github = require("./github.cjs");
|
|
32
|
+
var _showSources = import_options.logOptions.showSources;
|
|
33
|
+
var _githubAnnotations = import_options.logOptions.githubAnnotations;
|
|
34
|
+
import_options.logOptions.on("changed", (options) => {
|
|
35
|
+
_showSources = options.showSources;
|
|
36
|
+
_githubAnnotations = options.githubAnnotations;
|
|
37
|
+
});
|
|
31
38
|
var nul = "\u2400";
|
|
32
39
|
var ReportImpl = class {
|
|
33
40
|
constructor(_title, _task, _emitter) {
|
|
@@ -162,7 +169,7 @@ var ReportImpl = class {
|
|
|
162
169
|
}
|
|
163
170
|
done(showSources) {
|
|
164
171
|
if (showSources == null)
|
|
165
|
-
showSources =
|
|
172
|
+
showSources = _showSources;
|
|
166
173
|
if (!this.empty)
|
|
167
174
|
this._emit(showSources);
|
|
168
175
|
if (this.errors)
|
|
@@ -175,7 +182,7 @@ var ReportImpl = class {
|
|
|
175
182
|
let lPad = 0;
|
|
176
183
|
let cPad = 0;
|
|
177
184
|
if (this._annotations.size === 0 && this._records.size === 0)
|
|
178
|
-
return
|
|
185
|
+
return;
|
|
179
186
|
const entries = [...this._annotations.keys(), ...this._records.keys()].filter((file, i, a) => a.indexOf(file) === i).sort((a, b) => {
|
|
180
187
|
return (a || "") < (b || "") ? -1 : (a || "") > (b || "") ? 1 : 0;
|
|
181
188
|
}).map((file) => {
|
|
@@ -278,7 +285,22 @@ var ReportImpl = class {
|
|
|
278
285
|
this._emitter(options, status);
|
|
279
286
|
this._emitter(options, [""]);
|
|
280
287
|
}
|
|
281
|
-
|
|
288
|
+
if (_githubAnnotations) {
|
|
289
|
+
for (const entry of entries) {
|
|
290
|
+
const file = entry.file === nul ? void 0 : entry.file;
|
|
291
|
+
for (const report of entry.records) {
|
|
292
|
+
const type = report.level === import_levels.logLevels.ERROR ? "error" : report.level === import_levels.logLevels.WARN ? "warning" : null;
|
|
293
|
+
if (!type)
|
|
294
|
+
continue;
|
|
295
|
+
const title = `${this._title} (task "${this._task}")`;
|
|
296
|
+
const col = report.column || void 0;
|
|
297
|
+
const line = report.line || void 0;
|
|
298
|
+
const endColumn = report.column ? report.length >= Number.MAX_SAFE_INTEGER ? void 0 : report.column + report.length || void 0 : void 0;
|
|
299
|
+
const message = report.messages.join("\n");
|
|
300
|
+
(0, import_github.githubAnnotation)({ type, title, file, col, line, endColumn }, message);
|
|
301
|
+
}
|
|
302
|
+
}
|
|
303
|
+
}
|
|
282
304
|
}
|
|
283
305
|
};
|
|
284
306
|
// Annotate the CommonJS export names for ESM import in node:
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/logging/report.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,qBAA6B;AAC7B,gBAAyB;AACzB,oBAAyD;AACzD,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["tag"]
|
|
6
6
|
}
|
package/dist/logging/report.mjs
CHANGED
|
@@ -2,8 +2,15 @@
|
|
|
2
2
|
import { BuildFailure } from "../asserts.mjs";
|
|
3
3
|
import { readFile } from "../fs.mjs";
|
|
4
4
|
import { $blu, $cyn, $gry, $red, $und, $wht, $ylw } from "./colors.mjs";
|
|
5
|
-
import { ERROR, NOTICE, WARN } from "./levels.mjs";
|
|
5
|
+
import { ERROR, logLevels, NOTICE, WARN } from "./levels.mjs";
|
|
6
6
|
import { logOptions } from "./options.mjs";
|
|
7
|
+
import { githubAnnotation } from "./github.mjs";
|
|
8
|
+
var _showSources = logOptions.showSources;
|
|
9
|
+
var _githubAnnotations = logOptions.githubAnnotations;
|
|
10
|
+
logOptions.on("changed", (options) => {
|
|
11
|
+
_showSources = options.showSources;
|
|
12
|
+
_githubAnnotations = options.githubAnnotations;
|
|
13
|
+
});
|
|
7
14
|
var nul = "\u2400";
|
|
8
15
|
var ReportImpl = class {
|
|
9
16
|
constructor(_title, _task, _emitter) {
|
|
@@ -138,7 +145,7 @@ var ReportImpl = class {
|
|
|
138
145
|
}
|
|
139
146
|
done(showSources) {
|
|
140
147
|
if (showSources == null)
|
|
141
|
-
showSources =
|
|
148
|
+
showSources = _showSources;
|
|
142
149
|
if (!this.empty)
|
|
143
150
|
this._emit(showSources);
|
|
144
151
|
if (this.errors)
|
|
@@ -151,7 +158,7 @@ var ReportImpl = class {
|
|
|
151
158
|
let lPad = 0;
|
|
152
159
|
let cPad = 0;
|
|
153
160
|
if (this._annotations.size === 0 && this._records.size === 0)
|
|
154
|
-
return
|
|
161
|
+
return;
|
|
155
162
|
const entries = [...this._annotations.keys(), ...this._records.keys()].filter((file, i, a) => a.indexOf(file) === i).sort((a, b) => {
|
|
156
163
|
return (a || "") < (b || "") ? -1 : (a || "") > (b || "") ? 1 : 0;
|
|
157
164
|
}).map((file) => {
|
|
@@ -254,7 +261,22 @@ var ReportImpl = class {
|
|
|
254
261
|
this._emitter(options, status);
|
|
255
262
|
this._emitter(options, [""]);
|
|
256
263
|
}
|
|
257
|
-
|
|
264
|
+
if (_githubAnnotations) {
|
|
265
|
+
for (const entry of entries) {
|
|
266
|
+
const file = entry.file === nul ? void 0 : entry.file;
|
|
267
|
+
for (const report of entry.records) {
|
|
268
|
+
const type = report.level === logLevels.ERROR ? "error" : report.level === logLevels.WARN ? "warning" : null;
|
|
269
|
+
if (!type)
|
|
270
|
+
continue;
|
|
271
|
+
const title = `${this._title} (task "${this._task}")`;
|
|
272
|
+
const col = report.column || void 0;
|
|
273
|
+
const line = report.line || void 0;
|
|
274
|
+
const endColumn = report.column ? report.length >= Number.MAX_SAFE_INTEGER ? void 0 : report.column + report.length || void 0 : void 0;
|
|
275
|
+
const message = report.messages.join("\n");
|
|
276
|
+
githubAnnotation({ type, title, file, col, line, endColumn }, message);
|
|
277
|
+
}
|
|
278
|
+
}
|
|
279
|
+
}
|
|
258
280
|
}
|
|
259
281
|
};
|
|
260
282
|
export {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/logging/report.ts"],
|
|
4
|
-
"mappings": ";AAAA,SAAS,oBAAoB;AAC7B,SAAS,gBAAgB;AACzB,SAAS,MAAM,MAAM,MAAM,MAAM,MAAM,MAAM,YAAY;AACzD,SAAS,OAAO,QAAQ,YAAY;
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["tag"]
|
|
6
6
|
}
|
package/dist/logging.cjs
CHANGED
|
@@ -28,6 +28,7 @@ var import_async = require("./async.cjs");
|
|
|
28
28
|
var import_logger = require("./logging/logger.cjs");
|
|
29
29
|
var import_spinner = require("./logging/spinner.cjs");
|
|
30
30
|
__reExport(logging_exports, require("./logging/colors.cjs"), module.exports);
|
|
31
|
+
__reExport(logging_exports, require("./logging/github.cjs"), module.exports);
|
|
31
32
|
__reExport(logging_exports, require("./logging/levels.cjs"), module.exports);
|
|
32
33
|
__reExport(logging_exports, require("./logging/logger.cjs"), module.exports);
|
|
33
34
|
__reExport(logging_exports, require("./logging/options.cjs"), module.exports);
|
package/dist/logging.cjs.map
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../src/logging.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAA+B;AAC/B,oBAAoC;AACpC,qBAA6B;AAE7B,4BAAc,iCAJd;AAKA,4BAAc,iCALd;AAMA,4BAAc,iCANd;AAOA,4BAAc,
|
|
4
|
+
"mappings": ";;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAA+B;AAC/B,oBAAoC;AACpC,qBAA6B;AAE7B,4BAAc,iCAJd;AAKA,4BAAc,iCALd;AAMA,4BAAc,iCANd;AAOA,4BAAc,iCAPd;AAQA,4BAAc,kCARd;AASA,4BAAc,iCATd;AAAA,IAgBA,6BAAa;AAUN,IAAM,OAAoB,MAAmB;AAElD,QAAM,SAAS,UAAY,6BAAe,GAAG,WAAO,yBAAU;AAG9D,QAAM,UAAe;AAAA,IACnB,SAAS,MAA6B;AACpC,aAAO,EAAE,MAAM,GAAG,IAAI;AAAA,IACxB;AAAA,IAEA,SAAS,MAA6B;AACpC,aAAO,EAAE,MAAM,GAAG,IAAI;AAAA,IACxB;AAAA,IAEA,QAAQ,MAA6B;AACnC,aAAO,EAAE,KAAK,GAAG,IAAI;AAAA,IACvB;AAAA,IAEA,UAAU,MAA6B;AACrC,aAAO,EAAE,OAAO,GAAG,IAAI;AAAA,IACzB;AAAA,IAEA,QAAQ,MAA6B;AACnC,aAAO,EAAE,KAAK,GAAG,IAAI;AAAA,IACvB;AAAA,IAEA,SAAS,MAA6B;AACpC,aAAO,EAAE,MAAM,GAAG,IAAI;AAAA,IACxB;AAAA,IAEA,QAAQ,MAA8B;AACpC,aAAO,OAAO,EAAE,KAAK,GAAG,IAAI;AAAA,IAC9B;AAAA,EACF;AAGA,QAAMA,OAAM,IAAI,SAAgC,KAAK,QAAQ,OAAO,GAAG,IAAI;AAG3E,SAAO,OAAO,OAAOA,MAAK,OAAO;AACnC,GAAG;",
|
|
5
5
|
"names": ["log"]
|
|
6
6
|
}
|
package/dist/logging.d.ts
CHANGED
package/dist/logging.mjs
CHANGED
|
@@ -3,6 +3,7 @@ import { currentContext } from "./async.mjs";
|
|
|
3
3
|
import { getLogger } from "./logging/logger.mjs";
|
|
4
4
|
import { setupSpinner } from "./logging/spinner.mjs";
|
|
5
5
|
export * from "./logging/colors.mjs";
|
|
6
|
+
export * from "./logging/github.mjs";
|
|
6
7
|
export * from "./logging/levels.mjs";
|
|
7
8
|
export * from "./logging/logger.mjs";
|
|
8
9
|
export * from "./logging/options.mjs";
|
package/dist/logging.mjs.map
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../src/logging.ts"],
|
|
4
|
-
"mappings": ";AAAA,SAAS,sBAAsB;AAC/B,SAAS,iBAA2B;AACpC,SAAS,oBAAoB;AAE7B,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AAOd,aAAa;AAUN,IAAM,OAAoB,MAAmB;AAElD,QAAM,SAAS,MAAY,eAAe,GAAG,OAAO,UAAU;AAG9D,QAAM,UAAe;AAAA,IACnB,SAAS,MAA6B;AACpC,aAAO,EAAE,MAAM,GAAG,IAAI;AAAA,IACxB;AAAA,IAEA,SAAS,MAA6B;AACpC,aAAO,EAAE,MAAM,GAAG,IAAI;AAAA,IACxB;AAAA,IAEA,QAAQ,MAA6B;AACnC,aAAO,EAAE,KAAK,GAAG,IAAI;AAAA,IACvB;AAAA,IAEA,UAAU,MAA6B;AACrC,aAAO,EAAE,OAAO,GAAG,IAAI;AAAA,IACzB;AAAA,IAEA,QAAQ,MAA6B;AACnC,aAAO,EAAE,KAAK,GAAG,IAAI;AAAA,IACvB;AAAA,IAEA,SAAS,MAA6B;AACpC,aAAO,EAAE,MAAM,GAAG,IAAI;AAAA,IACxB;AAAA,IAEA,QAAQ,MAA8B;AACpC,aAAO,OAAO,EAAE,KAAK,GAAG,IAAI;AAAA,IAC9B;AAAA,EACF;AAGA,QAAMA,OAAM,IAAI,SAAgC,KAAK,QAAQ,OAAO,GAAG,IAAI;AAG3E,SAAO,OAAO,OAAOA,MAAK,OAAO;AACnC,GAAG;",
|
|
4
|
+
"mappings": ";AAAA,SAAS,sBAAsB;AAC/B,SAAS,iBAA2B;AACpC,SAAS,oBAAoB;AAE7B,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AAOd,aAAa;AAUN,IAAM,OAAoB,MAAmB;AAElD,QAAM,SAAS,MAAY,eAAe,GAAG,OAAO,UAAU;AAG9D,QAAM,UAAe;AAAA,IACnB,SAAS,MAA6B;AACpC,aAAO,EAAE,MAAM,GAAG,IAAI;AAAA,IACxB;AAAA,IAEA,SAAS,MAA6B;AACpC,aAAO,EAAE,MAAM,GAAG,IAAI;AAAA,IACxB;AAAA,IAEA,QAAQ,MAA6B;AACnC,aAAO,EAAE,KAAK,GAAG,IAAI;AAAA,IACvB;AAAA,IAEA,UAAU,MAA6B;AACrC,aAAO,EAAE,OAAO,GAAG,IAAI;AAAA,IACzB;AAAA,IAEA,QAAQ,MAA6B;AACnC,aAAO,EAAE,KAAK,GAAG,IAAI;AAAA,IACvB;AAAA,IAEA,SAAS,MAA6B;AACpC,aAAO,EAAE,MAAM,GAAG,IAAI;AAAA,IACxB;AAAA,IAEA,QAAQ,MAA8B;AACpC,aAAO,OAAO,EAAE,KAAK,GAAG,IAAI;AAAA,IAC9B;AAAA,EACF;AAGA,QAAMA,OAAM,IAAI,SAAgC,KAAK,QAAQ,OAAO,GAAG,IAAI;AAG3E,SAAO,OAAO,OAAOA,MAAK,OAAO;AACnC,GAAG;",
|
|
5
5
|
"names": ["log"]
|
|
6
6
|
}
|
package/dist/utils/exec.cjs
CHANGED
|
@@ -67,29 +67,36 @@ async function execChild(cmd, args, options = {}, context) {
|
|
|
67
67
|
if (extraPath)
|
|
68
68
|
childPaths.push(extraPath);
|
|
69
69
|
const PATH = childPaths.join(import_node_path.default.delimiter);
|
|
70
|
-
const logForkEnv = import_logging.logOptions.forkEnv(context.taskName);
|
|
70
|
+
const logForkEnv = import_logging.logOptions.forkEnv(context.taskName, 4);
|
|
71
71
|
const childEnv = { ...process.env, ...env, ...logForkEnv, PATH };
|
|
72
72
|
if (coverageDir)
|
|
73
73
|
childEnv.NODE_V8_COVERAGE = context.resolve(coverageDir);
|
|
74
74
|
const childOptions = {
|
|
75
75
|
...extraOptions,
|
|
76
|
-
stdio: ["ignore", "pipe", "pipe"],
|
|
76
|
+
stdio: ["ignore", "pipe", "pipe", "ipc", "pipe"],
|
|
77
77
|
cwd: childCwd,
|
|
78
78
|
env: childEnv,
|
|
79
79
|
shell
|
|
80
80
|
};
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
context.log.info("Executing", [cmd, ...args]);
|
|
84
|
-
context.log.info("Execution options", childOptions);
|
|
81
|
+
context.log.info(fork ? "Forking" : "Executing", [cmd, ...args]);
|
|
82
|
+
context.log.debug("Child process options", childOptions);
|
|
85
83
|
const child = fork ? (0, import_node_child_process.fork)(cmd, args, childOptions) : (0, import_node_child_process.spawn)(cmd, args, childOptions);
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
84
|
+
try {
|
|
85
|
+
context.log.info("Child process PID", child.pid);
|
|
86
|
+
if (child.stdout) {
|
|
87
|
+
const out = import_node_readline.default.createInterface(child.stdout);
|
|
88
|
+
out.on("line", (line) => context.log.notice(line || "\xA0"));
|
|
89
|
+
}
|
|
90
|
+
if (child.stderr) {
|
|
91
|
+
const err = import_node_readline.default.createInterface(child.stderr);
|
|
92
|
+
err.on("line", (line) => context.log.warn(line || "\xA0"));
|
|
93
|
+
}
|
|
94
|
+
if (child.stdio[4]) {
|
|
95
|
+
child.stdio[4].on("data", (data) => import_logging.logOptions.output.write(data));
|
|
96
|
+
}
|
|
97
|
+
} catch (error) {
|
|
98
|
+
child.kill();
|
|
99
|
+
throw error;
|
|
93
100
|
}
|
|
94
101
|
return new Promise((resolve, reject) => {
|
|
95
102
|
child.on("error", (error) => reject(error));
|
package/dist/utils/exec.cjs.map
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/utils/exec.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,uBAAiB;AACjB,
|
|
5
|
-
"names": ["path", "forkProcess", "spawnProcess", "
|
|
4
|
+
"mappings": "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",
|
|
5
|
+
"names": ["path", "forkProcess", "spawnProcess", "readline"]
|
|
6
6
|
}
|
package/dist/utils/exec.mjs
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
// utils/exec.ts
|
|
2
2
|
import path from "node:path";
|
|
3
|
-
import
|
|
3
|
+
import readline from "node:readline";
|
|
4
4
|
import { fork as forkProcess, spawn as spawnProcess } from "node:child_process";
|
|
5
5
|
import { assert, BuildFailure } from "../asserts.mjs";
|
|
6
6
|
import { $p, logOptions } from "../logging.mjs";
|
|
@@ -33,29 +33,36 @@ async function execChild(cmd, args, options = {}, context) {
|
|
|
33
33
|
if (extraPath)
|
|
34
34
|
childPaths.push(extraPath);
|
|
35
35
|
const PATH = childPaths.join(path.delimiter);
|
|
36
|
-
const logForkEnv = logOptions.forkEnv(context.taskName);
|
|
36
|
+
const logForkEnv = logOptions.forkEnv(context.taskName, 4);
|
|
37
37
|
const childEnv = { ...process.env, ...env, ...logForkEnv, PATH };
|
|
38
38
|
if (coverageDir)
|
|
39
39
|
childEnv.NODE_V8_COVERAGE = context.resolve(coverageDir);
|
|
40
40
|
const childOptions = {
|
|
41
41
|
...extraOptions,
|
|
42
|
-
stdio: ["ignore", "pipe", "pipe"],
|
|
42
|
+
stdio: ["ignore", "pipe", "pipe", "ipc", "pipe"],
|
|
43
43
|
cwd: childCwd,
|
|
44
44
|
env: childEnv,
|
|
45
45
|
shell
|
|
46
46
|
};
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
context.log.info("Executing", [cmd, ...args]);
|
|
50
|
-
context.log.info("Execution options", childOptions);
|
|
47
|
+
context.log.info(fork ? "Forking" : "Executing", [cmd, ...args]);
|
|
48
|
+
context.log.debug("Child process options", childOptions);
|
|
51
49
|
const child = fork ? forkProcess(cmd, args, childOptions) : spawnProcess(cmd, args, childOptions);
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
50
|
+
try {
|
|
51
|
+
context.log.info("Child process PID", child.pid);
|
|
52
|
+
if (child.stdout) {
|
|
53
|
+
const out = readline.createInterface(child.stdout);
|
|
54
|
+
out.on("line", (line) => context.log.notice(line || "\xA0"));
|
|
55
|
+
}
|
|
56
|
+
if (child.stderr) {
|
|
57
|
+
const err = readline.createInterface(child.stderr);
|
|
58
|
+
err.on("line", (line) => context.log.warn(line || "\xA0"));
|
|
59
|
+
}
|
|
60
|
+
if (child.stdio[4]) {
|
|
61
|
+
child.stdio[4].on("data", (data) => logOptions.output.write(data));
|
|
62
|
+
}
|
|
63
|
+
} catch (error) {
|
|
64
|
+
child.kill();
|
|
65
|
+
throw error;
|
|
59
66
|
}
|
|
60
67
|
return new Promise((resolve, reject) => {
|
|
61
68
|
child.on("error", (error) => reject(error));
|
package/dist/utils/exec.mjs.map
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/utils/exec.ts"],
|
|
4
|
-
"mappings": ";AAAA,OAAO,UAAU;AACjB,OAAO,
|
|
4
|
+
"mappings": ";AAAA,OAAO,UAAU;AACjB,OAAO,cAAc;AACrB,SAAS,QAAQ,aAAa,SAAS,oBAAoB;AAE3D,SAAS,QAAQ,oBAAoB;AACrC,SAAS,IAAI,kBAAkB;AAC/B,SAAS,4BAA4B,wBAAwB;AAoB7D,eAAsB,UAClB,KACA,MACA,UAA4B,CAAC,GAC7B,SACa;AACf,QAAM;AAAA,IACJ,MAAM,CAAC;AAAA;AAAA,IACP,OAAO;AAAA;AAAA,IACP,QAAQ;AAAA;AAAA,IACR,MAAM;AAAA;AAAA,IACN;AAAA;AAAA,IACA,GAAG;AAAA,EACL,IAAI;AAEJ,QAAM,WAAW,MAAM,QAAQ,QAAQ,GAAG,IAAI,2BAA2B;AACzE,SAAO,iBAAiB,QAAQ,GAAG,6BAA6B,GAAG,QAAQ,kBAAkB;AAG7F,SAAO,EAAE,QAAQ,QAAQ,4CAA4C;AAGrE,QAAM,aAA6B,CAAC;AAGpC,QAAM,eAAe,QAAQ,QAAQ,iBAAiB,MAAM;AAC5D,MAAI,iBAAiB,YAAY;AAAG,eAAW,KAAK,YAAY;AAGhE,QAAM,gBAAgB,QAAQ,QAAQ,kBAAkB,MAAM;AAC9D,MAAI,iBAAiB,aAAa;AAAG,eAAW,KAAK,aAAa;AAGlE,QAAM,YAAY,IAAI,QAAQ,QAAQ,IAAI;AAC1C,MAAI;AAAW,eAAW,KAAK,SAAS;AAGxC,QAAM,OAAO,WAAW,KAAK,KAAK,SAAS;AAC3C,QAAM,aAAa,WAAW,QAAQ,QAAQ,UAAU,CAAC;AACzD,QAAM,WAAmC,EAAE,GAAG,QAAQ,KAAK,GAAG,KAAK,GAAG,YAAY,KAAK;AAGvF,MAAI;AAAa,aAAS,mBAAmB,QAAQ,QAAQ,WAAW;AAGxE,QAAM,eAA6B;AAAA,IACjC,GAAG;AAAA,IACH,OAAO,CAAE,UAAU,QAAQ,QAAQ,OAAO,MAAO;AAAA,IACjD,KAAK;AAAA,IACL,KAAK;AAAA,IACL;AAAA,EACF;AAGA,UAAQ,IAAI,KAAK,OAAO,YAAY,aAAa,CAAE,KAAK,GAAG,IAAK,CAAC;AACjE,UAAQ,IAAI,MAAM,yBAAyB,YAAY;AAEvD,QAAM,QAAQ,OACZ,YAAY,KAAK,MAAM,YAAY,IACnC,aAAa,KAAK,MAAM,YAAY;AAEtC,MAAI;AACF,YAAQ,IAAI,KAAK,qBAAqB,MAAM,GAAG;AAG/C,QAAI,MAAM,QAAQ;AAChB,YAAM,MAAM,SAAS,gBAAgB,MAAM,MAAM;AACjD,UAAI,GAAG,QAAQ,CAAC,SAAS,QAAQ,IAAI,OAAO,QAAQ,MAAQ,CAAC;AAAA,IAC/D;AAGA,QAAI,MAAM,QAAQ;AAChB,YAAM,MAAM,SAAS,gBAAgB,MAAM,MAAM;AACjD,UAAI,GAAG,QAAQ,CAAC,SAAS,QAAQ,IAAI,KAAK,QAAO,MAAQ,CAAC;AAAA,IAC5D;AAGA,QAAI,MAAM,MAAM,CAAC,GAAG;AAClB,YAAM,MAAM,CAAC,EAAE,GAAG,QAAQ,CAAC,SAAS,WAAW,OAAO,MAAM,IAAI,CAAC;AAAA,IACnE;AAAA,EACF,SAAS,OAAP;AAEA,UAAM,KAAK;AACX,UAAM;AAAA,EACR;AAGA,SAAO,IAAI,QAAc,CAAC,SAAS,WAAW;AAC5C,UAAM,GAAG,SAAS,CAAC,UAAU,OAAO,KAAK,CAAC;AAC1C,UAAM,GAAG,QAAQ,CAAC,MAAM,WAAW;AACjC,UAAI,SAAS;AAAG,eAAO,QAAQ;AAC/B,UAAI;AAAQ,eAAO,OAAO,aAAa,YAAY,oCAAoC,QAAQ,CAAC;AAChG,UAAI;AAAM,eAAO,OAAO,aAAa,YAAY,kCAAkC,MAAM,CAAC;AAC1F,aAAO,aAAa,YAAY,4CAA4C,CAAC;AAAA,IAC/E,CAAC;AAAA,EACH,CAAC;AACH;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
package/extra/plug.mts
CHANGED
|
@@ -6,11 +6,14 @@ import _path from 'node:path'
|
|
|
6
6
|
|
|
7
7
|
import _yargs from 'yargs-parser'
|
|
8
8
|
|
|
9
|
-
import { $blu, $gry, $rst, $tsk, $und, $wht, isDirectory, isFile, main
|
|
9
|
+
import { $blu, $gry, $rst, $tsk, $und, $wht, isDirectory, isFile, main } from './utils.js'
|
|
10
10
|
|
|
11
11
|
import type { BuildFailure } from '../src/asserts.js'
|
|
12
12
|
import type { Build } from '../src/index.js'
|
|
13
13
|
|
|
14
|
+
/** Version injected by esbuild */
|
|
15
|
+
declare const __version: string
|
|
16
|
+
|
|
14
17
|
/* ========================================================================== *
|
|
15
18
|
* ========================================================================== *
|
|
16
19
|
* BUILD INSPECTION *
|
|
@@ -123,7 +126,7 @@ export function parseCommandLine(args: string[]): CommandLineOptions {
|
|
|
123
126
|
help = !! value
|
|
124
127
|
break
|
|
125
128
|
case 'version':
|
|
126
|
-
console.log(`v${
|
|
129
|
+
console.log(`v${__version}`)
|
|
127
130
|
process.exit(0)
|
|
128
131
|
break
|
|
129
132
|
default:
|
|
@@ -151,7 +154,7 @@ export function parseCommandLine(args: string[]): CommandLineOptions {
|
|
|
151
154
|
${$wht}-c --colors${$rst} Force colorful output (use "--no-colors" to force plain text)
|
|
152
155
|
${$wht}-l --list${$rst} Only list the tasks defined by the build, nothing more!
|
|
153
156
|
${$wht}-h --help${$rst} Help! You're reading it now!
|
|
154
|
-
${$wht} --version${$rst} Version! This one: ${
|
|
157
|
+
${$wht} --version${$rst} Version! This one: ${__version}!
|
|
155
158
|
|
|
156
159
|
${$blu}${$und}Properties:${$rst}
|
|
157
160
|
|