tsx-strict 0.3.3 → 0.4.0-canary.1
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/cli.js +1 -0
- package/dist/cli.js.map +1 -1
- package/dist/file-watcher.d.ts +1 -1
- package/dist/file-watcher.d.ts.map +1 -1
- package/dist/file-watcher.js +2 -2
- package/dist/file-watcher.js.map +1 -1
- package/dist/index.d.ts +3 -2
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +73 -46
- package/dist/index.js.map +1 -1
- package/dist/killer.d.ts.map +1 -1
- package/dist/killer.js +12 -3
- package/dist/killer.js.map +1 -1
- package/package.json +3 -2
package/dist/cli.js
CHANGED
|
@@ -17,6 +17,7 @@ program
|
|
|
17
17
|
.argument("<file>", "TypeScript file to run")
|
|
18
18
|
.option("-w, --watch", "Enable watch mode", false)
|
|
19
19
|
.option("--include <pattern>", "Include glob pattern to watch", collect, [])
|
|
20
|
+
.option("--restart-delay <number>", "The time it must wait to restart when file change", "100")
|
|
20
21
|
.option("--no-clear", "Do not clear screen", true)
|
|
21
22
|
.option("--compiler <compiler>", "Compiler", "typescript/bin/tsc")
|
|
22
23
|
.option("--tsc-args <args...>", "Additional tsc arguments")
|
package/dist/cli.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";;;AACA,yCAAoC;AACpC,mCAAuC;AACvC,mBAAiB;AACjB,2BAAkC;AAElC,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,IAAA,iBAAY,EAAC,gBAAgB,EAAE,MAAM,CAAC,CAAC,CAAC;AACvE,MAAM,OAAO,GAAG,IAAI,mBAAO,EAAE,CAAC;AAE9B,SAAS,OAAO,CAAC,KAAU,EAAE,QAAa;IACxC,OAAO,QAAQ,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;AAClC,CAAC;AAED,OAAO;KACJ,IAAI,CAAC,YAAY,CAAC;KAClB,WAAW,CAAC,sCAAsC,CAAC;KACnD,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC;KAC5B,QAAQ,CAAC,QAAQ,EAAE,wBAAwB,CAAC;KAC5C,MAAM,CAAC,aAAa,EAAE,mBAAmB,EAAE,KAAK,CAAC;KACjD,MAAM,CAAC,qBAAqB,EAAE,+BAA+B,EAAE,OAAO,EAAE,EAAE,CAAC;KAC3E,MAAM,CAAC,YAAY,EAAE,qBAAqB,EAAE,IAAI,CAAC;KACjD,MAAM,CAAC,uBAAuB,EAAE,UAAU,EAAE,oBAAoB,CAAC;KACjE,MAAM,CAAC,sBAAsB,EAAE,0BAA0B,CAAC;KAC1D,MAAM,CAAC,sBAAsB,EAAE,0BAA0B,CAAC;KAC1D,MAAM,CAAC,iBAAiB,EAAE,uCAAuC,EAAE,IAAI,CAAC;KACxE,MAAM,CAAC,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE;IAC9B,IAAI,CAAC;QACH,MAAM,IAAA,oBAAY,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACpC,CAAC;IAAC,OAAO,KAAU,EAAE,CAAC;QACpB,OAAO,CAAC,KAAK,CAAC,QAAQ,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;QACvC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;AACH,CAAC,CAAC,CAAC;AACL,OAAO,CAAC,KAAK,EAAE,CAAC"}
|
|
1
|
+
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";;;AACA,yCAAoC;AACpC,mCAAuC;AACvC,mBAAiB;AACjB,2BAAkC;AAElC,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,IAAA,iBAAY,EAAC,gBAAgB,EAAE,MAAM,CAAC,CAAC,CAAC;AACvE,MAAM,OAAO,GAAG,IAAI,mBAAO,EAAE,CAAC;AAE9B,SAAS,OAAO,CAAC,KAAU,EAAE,QAAa;IACxC,OAAO,QAAQ,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;AAClC,CAAC;AAED,OAAO;KACJ,IAAI,CAAC,YAAY,CAAC;KAClB,WAAW,CAAC,sCAAsC,CAAC;KACnD,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC;KAC5B,QAAQ,CAAC,QAAQ,EAAE,wBAAwB,CAAC;KAC5C,MAAM,CAAC,aAAa,EAAE,mBAAmB,EAAE,KAAK,CAAC;KACjD,MAAM,CAAC,qBAAqB,EAAE,+BAA+B,EAAE,OAAO,EAAE,EAAE,CAAC;KAC3E,MAAM,CACL,0BAA0B,EAC1B,mDAAmD,EACnD,KAAK,CACN;KACA,MAAM,CAAC,YAAY,EAAE,qBAAqB,EAAE,IAAI,CAAC;KACjD,MAAM,CAAC,uBAAuB,EAAE,UAAU,EAAE,oBAAoB,CAAC;KACjE,MAAM,CAAC,sBAAsB,EAAE,0BAA0B,CAAC;KAC1D,MAAM,CAAC,sBAAsB,EAAE,0BAA0B,CAAC;KAC1D,MAAM,CAAC,iBAAiB,EAAE,uCAAuC,EAAE,IAAI,CAAC;KACxE,MAAM,CAAC,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE;IAC9B,IAAI,CAAC;QACH,MAAM,IAAA,oBAAY,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACpC,CAAC;IAAC,OAAO,KAAU,EAAE,CAAC;QACpB,OAAO,CAAC,KAAK,CAAC,QAAQ,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;QACvC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;AACH,CAAC,CAAC,CAAC;AACL,OAAO,CAAC,KAAK,EAAE,CAAC"}
|
package/dist/file-watcher.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file-watcher.d.ts","sourceRoot":"","sources":["../src/file-watcher.ts"],"names":[],"mappings":"AAKA,wBAAgB,gBAAgB,CAAC,UAAU,EAAE,MAAM,IAAI,
|
|
1
|
+
{"version":3,"file":"file-watcher.d.ts","sourceRoot":"","sources":["../src/file-watcher.ts"],"names":[],"mappings":"AAKA,wBAAgB,gBAAgB,CAAC,UAAU,EAAE,MAAM,IAAI,EAAE,YAAY,EAAE,MAAM,QAuC5E;AAED,wBAAgB,eAAe,SAK9B"}
|
package/dist/file-watcher.js
CHANGED
|
@@ -8,7 +8,7 @@ exports.stopFileWatcher = stopFileWatcher;
|
|
|
8
8
|
const chokidar_1 = __importDefault(require("chokidar"));
|
|
9
9
|
const sheu_1 = __importDefault(require("./sheu"));
|
|
10
10
|
let fileWatcher = null;
|
|
11
|
-
function setupFileWatcher(restartTsx) {
|
|
11
|
+
function setupFileWatcher(restartTsx, restartDelay) {
|
|
12
12
|
if (fileWatcher) {
|
|
13
13
|
fileWatcher.close();
|
|
14
14
|
fileWatcher = null;
|
|
@@ -37,7 +37,7 @@ function setupFileWatcher(restartTsx) {
|
|
|
37
37
|
});
|
|
38
38
|
setTimeout(() => {
|
|
39
39
|
isRestarting = false;
|
|
40
|
-
},
|
|
40
|
+
}, restartDelay);
|
|
41
41
|
restartTsx?.();
|
|
42
42
|
});
|
|
43
43
|
}
|
package/dist/file-watcher.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file-watcher.js","sourceRoot":"","sources":["../src/file-watcher.ts"],"names":[],"mappings":";;;;;AAKA,4CAuCC;AAED,0CAKC;AAnDD,wDAA+C;AAC/C,kDAA0B;AAE1B,IAAI,WAAW,GAAqB,IAAI,CAAC;AAEzC,SAAgB,gBAAgB,CAAC,UAAsB;
|
|
1
|
+
{"version":3,"file":"file-watcher.js","sourceRoot":"","sources":["../src/file-watcher.ts"],"names":[],"mappings":";;;;;AAKA,4CAuCC;AAED,0CAKC;AAnDD,wDAA+C;AAC/C,kDAA0B;AAE1B,IAAI,WAAW,GAAqB,IAAI,CAAC;AAEzC,SAAgB,gBAAgB,CAAC,UAAsB,EAAE,YAAoB;IAC3E,IAAI,WAAW,EAAE,CAAC;QAChB,WAAW,CAAC,KAAK,EAAE,CAAC;QACpB,WAAW,GAAG,IAAI,CAAC;IACrB,CAAC;IAED,WAAW,GAAG,kBAAQ,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,EAAE;QAC5C,OAAO,EAAE,CAAC,cAAc,EAAE,QAAQ,EAAE,MAAM,CAAC;QAC3C,aAAa,EAAE,IAAI;QACnB,UAAU,EAAE,IAAI;KACjB,CAAC,CAAC;IAEH,IAAI,YAAY,GAAG,KAAK,CAAC;IACzB,WAAW,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE;QACpC,IACE,KAAK,KAAK,OAAO;YACjB,YAAY;YACZ,CAAC,CAAC,oCAAoC,CAAC,IAAI,CAAC,IAAI,CAAC;gBAC/C,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;YAEzB,OAAO;QACT,YAAY,GAAG,IAAI,CAAC;QAEpB,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,EAAE,CAAC,CAAC;QACvC,IAAI,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC;YACzB,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC;YACvB,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC;gBACrB,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC;gBACxB,CAAC,CAAC,IAAI,CAAC;QAEX,cAAI,CAAC,IAAI,CAAC,uCAAuC,IAAI,EAAE,EAAE;YACvD,SAAS,EAAE,IAAI;SAChB,CAAC,CAAC;QAEH,UAAU,CAAC,GAAG,EAAE;YACd,YAAY,GAAG,KAAK,CAAC;QACvB,CAAC,EAAE,YAAY,CAAC,CAAC;QACjB,UAAU,EAAE,EAAE,CAAC;IACjB,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAgB,eAAe;IAC7B,IAAI,WAAW,EAAE,CAAC;QAChB,WAAW,CAAC,KAAK,EAAE,CAAC;QACpB,WAAW,GAAG,IAAI,CAAC;IACrB,CAAC;AACH,CAAC"}
|
package/dist/index.d.ts
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
#!/usr/bin/env node
|
|
2
|
-
|
|
2
|
+
import { Worker } from "worker_threads";
|
|
3
|
+
export declare let tsxKiller: Worker | null;
|
|
3
4
|
export declare function setTsxKiller(value: typeof tsxKiller): void;
|
|
4
|
-
export declare function getTsxKiller(): (
|
|
5
|
+
export declare function getTsxKiller(): () => void;
|
|
5
6
|
export declare function runTsxStrict(file: string, options: Record<string, any>): Promise<void>;
|
|
6
7
|
//# sourceMappingURL=index.d.ts.map
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAGA,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AASxC,eAAO,IAAI,SAAS,EAAE,MAAM,GAAG,IAAW,CAAC;AAE3C,wBAAgB,YAAY,CAAC,KAAK,EAAE,OAAO,SAAS,QAEnD;AAED,wBAAgB,YAAY,eAI3B;AAED,wBAAsB,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,iBAkM5E"}
|
package/dist/index.js
CHANGED
|
@@ -42,8 +42,8 @@ exports.setTsxKiller = setTsxKiller;
|
|
|
42
42
|
exports.getTsxKiller = getTsxKiller;
|
|
43
43
|
exports.runTsxStrict = runTsxStrict;
|
|
44
44
|
const node_cleanup_1 = __importStar(require("node-cleanup"));
|
|
45
|
+
const worker_threads_1 = require("worker_threads");
|
|
45
46
|
const cross_spawn_1 = __importDefault(require("cross-spawn"));
|
|
46
|
-
const runner_1 = require("./runner");
|
|
47
47
|
const stdout_manipulator_1 = require("./stdout-manipulator");
|
|
48
48
|
const readline_1 = require("readline");
|
|
49
49
|
const killer_1 = require("./killer");
|
|
@@ -55,11 +55,14 @@ function setTsxKiller(value) {
|
|
|
55
55
|
exports.tsxKiller = value;
|
|
56
56
|
}
|
|
57
57
|
function getTsxKiller() {
|
|
58
|
-
return
|
|
58
|
+
return () => {
|
|
59
|
+
exports.tsxKiller?.terminate();
|
|
60
|
+
};
|
|
59
61
|
}
|
|
60
62
|
async function runTsxStrict(file, options) {
|
|
61
|
-
|
|
62
|
-
|
|
63
|
+
process.env.FORCE_COLOR = "3";
|
|
64
|
+
const { clear = true, typeCheck = true, compiler = "tsc", watch = false, tscArgs = "", tsxArgs = "", maxNodeMem, restartDelay, } = options;
|
|
65
|
+
async function runTsxCommand() {
|
|
63
66
|
const tsxArgsArray = [];
|
|
64
67
|
tsxArgsArray.push(file);
|
|
65
68
|
if (tsxArgs.trim()) {
|
|
@@ -71,13 +74,34 @@ async function runTsxStrict(file, options) {
|
|
|
71
74
|
tsxArgsArray.length = 0;
|
|
72
75
|
tsxArgsArray.push(...uniqueArgs);
|
|
73
76
|
}
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
77
|
+
if (exports.tsxKiller) {
|
|
78
|
+
await exports.tsxKiller.terminate();
|
|
79
|
+
exports.tsxKiller = null;
|
|
80
|
+
}
|
|
81
|
+
exports.tsxKiller = new worker_threads_1.Worker(file, {
|
|
82
|
+
argv: tsxArgsArray,
|
|
83
|
+
execArgv: ["-r", "tsx/cjs"],
|
|
84
|
+
});
|
|
85
|
+
exports.tsxKiller.on("error", (error) => {
|
|
86
|
+
if (!error.message.includes("require() of ES Module"))
|
|
87
|
+
throw error;
|
|
88
|
+
exports.tsxKiller = new worker_threads_1.Worker(file, {
|
|
89
|
+
argv: tsxArgsArray,
|
|
90
|
+
execArgv: ["-r", "tsx"],
|
|
91
|
+
});
|
|
92
|
+
exports.tsxKiller.on("error", (error) => {
|
|
93
|
+
throw error;
|
|
94
|
+
});
|
|
95
|
+
exports.tsxKiller.on("exit", (code) => {
|
|
96
|
+
console.error(`Worker stopped with exit code ${code}`);
|
|
97
|
+
});
|
|
98
|
+
});
|
|
99
|
+
exports.tsxKiller.on("exit", (code) => {
|
|
100
|
+
if (code !== 0 && code !== 1)
|
|
101
|
+
console.error(`Worker stopped with exit code ${code}`);
|
|
102
|
+
});
|
|
79
103
|
}
|
|
80
|
-
runTsxCommand();
|
|
104
|
+
await runTsxCommand();
|
|
81
105
|
if (!typeCheck)
|
|
82
106
|
return;
|
|
83
107
|
const tscArgsArray = [];
|
|
@@ -108,26 +132,22 @@ async function runTsxStrict(file, options) {
|
|
|
108
132
|
let compilationId = 0;
|
|
109
133
|
let compilationErrorSinceStart = false;
|
|
110
134
|
let hasTsErrors = false;
|
|
111
|
-
function restartTsx() {
|
|
135
|
+
async function restartTsx() {
|
|
112
136
|
compilationId++;
|
|
113
|
-
(0, killer_1.killProcesses)(compilationId)
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
});
|
|
137
|
+
const previousCompilationId = await (0, killer_1.killProcesses)(compilationId);
|
|
138
|
+
if (previousCompilationId !== compilationId)
|
|
139
|
+
return;
|
|
140
|
+
if (compilationErrorSinceStart)
|
|
141
|
+
Signal.emitFail();
|
|
142
|
+
else {
|
|
143
|
+
Signal.emitSuccess();
|
|
144
|
+
await runTsxCommand();
|
|
145
|
+
}
|
|
123
146
|
}
|
|
124
147
|
if (watch)
|
|
125
|
-
(0, file_watcher_1.setupFileWatcher)(restartTsx);
|
|
148
|
+
(0, file_watcher_1.setupFileWatcher)(restartTsx, Number(restartDelay));
|
|
126
149
|
const rl = (0, readline_1.createInterface)({ input: tscProcess.stdout });
|
|
127
|
-
rl.on("line", function (line) {
|
|
128
|
-
(0, stdout_manipulator_1.print)(line, {
|
|
129
|
-
clear,
|
|
130
|
-
});
|
|
150
|
+
rl.on("line", async function (line) {
|
|
131
151
|
const state = (0, stdout_manipulator_1.detectState)(line);
|
|
132
152
|
const compilationStarted = state.compilationStarted;
|
|
133
153
|
const compilationError = state.compilationError;
|
|
@@ -137,11 +157,10 @@ async function runTsxStrict(file, options) {
|
|
|
137
157
|
if (compilationError) {
|
|
138
158
|
hasTsErrors = true;
|
|
139
159
|
compilationId++;
|
|
140
|
-
(0, killer_1.killProcesses)(compilationId)
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
});
|
|
160
|
+
const previousCompilationId = await (0, killer_1.killProcesses)(compilationId);
|
|
161
|
+
if (previousCompilationId !== compilationId)
|
|
162
|
+
return;
|
|
163
|
+
Signal.emitStarted();
|
|
145
164
|
}
|
|
146
165
|
compilationErrorSinceStart =
|
|
147
166
|
(!compilationStarted && compilationErrorSinceStart) || compilationError;
|
|
@@ -149,26 +168,30 @@ async function runTsxStrict(file, options) {
|
|
|
149
168
|
Signal.emitFile(state.fileEmitted);
|
|
150
169
|
if (compilationCompleteWithoutError && !hasTsErrors && !firstTime) {
|
|
151
170
|
compilationId++;
|
|
152
|
-
(0, killer_1.killProcesses)(compilationId)
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
});
|
|
171
|
+
const previousCompilationId = await (0, killer_1.killProcesses)(compilationId);
|
|
172
|
+
if (previousCompilationId !== compilationId)
|
|
173
|
+
return;
|
|
174
|
+
if (compilationErrorSinceStart)
|
|
175
|
+
Signal.emitFail();
|
|
176
|
+
else {
|
|
177
|
+
Signal.emitSuccess();
|
|
178
|
+
await runTsxCommand();
|
|
179
|
+
}
|
|
162
180
|
}
|
|
163
181
|
else if (firstTime && compilationCompleteWithoutError && !hasTsErrors) {
|
|
164
182
|
firstTime = false;
|
|
165
183
|
Signal.emitFirstSuccess();
|
|
166
184
|
}
|
|
185
|
+
(0, stdout_manipulator_1.print)(line, {
|
|
186
|
+
clear,
|
|
187
|
+
});
|
|
167
188
|
});
|
|
168
189
|
if (typeof process.on === "function")
|
|
169
|
-
process.on("message", (msg) => {
|
|
170
|
-
if (msg === "run-on-success-command" && exports.tsxKiller)
|
|
171
|
-
|
|
190
|
+
process.on("message", async (msg) => {
|
|
191
|
+
if (msg === "run-on-success-command" && exports.tsxKiller) {
|
|
192
|
+
await exports.tsxKiller.terminate();
|
|
193
|
+
await runTsxCommand();
|
|
194
|
+
}
|
|
172
195
|
});
|
|
173
196
|
const sendSignal = (msg) => process.send && process.send(msg);
|
|
174
197
|
const Signal = {
|
|
@@ -178,13 +201,17 @@ async function runTsxStrict(file, options) {
|
|
|
178
201
|
emitFail: () => sendSignal("compile_errors"),
|
|
179
202
|
emitFile: (path) => sendSignal(`file_emitted:${path}`),
|
|
180
203
|
};
|
|
181
|
-
|
|
204
|
+
node_cleanup_1.default(async (_exitCode, signal) => {
|
|
182
205
|
if (signal)
|
|
183
206
|
tscProcess.kill(signal);
|
|
207
|
+
if (exports.tsxKiller) {
|
|
208
|
+
await exports.tsxKiller.terminate();
|
|
209
|
+
}
|
|
184
210
|
(0, file_watcher_1.stopFileWatcher)();
|
|
185
|
-
(0, killer_1.killProcesses)(0)
|
|
211
|
+
await (0, killer_1.killProcesses)(0);
|
|
186
212
|
// don't call cleanup handler again
|
|
187
213
|
(0, node_cleanup_1.uninstall)();
|
|
214
|
+
process.exit();
|
|
188
215
|
return false;
|
|
189
216
|
});
|
|
190
217
|
}
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAcA,oCAEC;AAED,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
package/dist/killer.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"killer.d.ts","sourceRoot":"","sources":["../src/killer.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAQ,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"killer.d.ts","sourceRoot":"","sources":["../src/killer.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAQ,MAAM,eAAe,CAAC;AAcnD,wBAAgB,IAAI,CAAC,KAAK,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CAoBvD;AAID,wBAAsB,aAAa,CACjC,oBAAoB,EAAE,MAAM,GAC3B,OAAO,CAAC,MAAM,CAAC,CAsCjB"}
|
package/dist/killer.js
CHANGED
|
@@ -47,8 +47,16 @@ async function killProcesses(currentCompilationId) {
|
|
|
47
47
|
return runningKillProcessesPromise.then(() => currentCompilationId);
|
|
48
48
|
const promisesToWaitFor = [];
|
|
49
49
|
const tsxKiller = (0, _1.getTsxKiller)();
|
|
50
|
-
if (tsxKiller) {
|
|
51
|
-
|
|
50
|
+
if (tsxKiller && typeof tsxKiller === "function") {
|
|
51
|
+
// tsxKiller is Worker.terminate method bound to the worker instance
|
|
52
|
+
promisesToWaitFor.push(new Promise((resolve) => {
|
|
53
|
+
tsxKiller();
|
|
54
|
+
resolve(null);
|
|
55
|
+
})
|
|
56
|
+
// .catch((error) => {
|
|
57
|
+
// console.error("Error terminating worker:", error);
|
|
58
|
+
// })
|
|
59
|
+
);
|
|
52
60
|
(0, _1.setTsxKiller)(null);
|
|
53
61
|
}
|
|
54
62
|
runningKillProcessesPromise = Promise.all(promisesToWaitFor)
|
|
@@ -57,7 +65,8 @@ async function killProcesses(currentCompilationId) {
|
|
|
57
65
|
return currentCompilationId;
|
|
58
66
|
})
|
|
59
67
|
.catch((error) => {
|
|
60
|
-
|
|
68
|
+
if (!error.message.includes("Cannot read properties of undefined (reading 'threadId')"))
|
|
69
|
+
console.error("Error killing processes:", error);
|
|
61
70
|
runningKillProcessesPromise = null;
|
|
62
71
|
return currentCompilationId;
|
|
63
72
|
});
|
package/dist/killer.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"killer.js","sourceRoot":"","sources":["../src/killer.ts"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"killer.js","sourceRoot":"","sources":["../src/killer.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "tsx-strict",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.4.0-canary.1",
|
|
4
4
|
"description": "TSX runner with automatic Type-checking",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -41,7 +41,7 @@
|
|
|
41
41
|
"node": ">=20.0.0"
|
|
42
42
|
},
|
|
43
43
|
"peerDependencies": {
|
|
44
|
-
"tsx": "^4.
|
|
44
|
+
"tsx": "^4.21.0"
|
|
45
45
|
},
|
|
46
46
|
"devDependencies": {
|
|
47
47
|
"@types/cross-spawn": "^6.0.6",
|
|
@@ -53,6 +53,7 @@
|
|
|
53
53
|
"rimraf": "^5.0.0",
|
|
54
54
|
"ts-jest": "^29.4.5",
|
|
55
55
|
"ts-node-dev": "^2.0.0",
|
|
56
|
+
"tsx": "^4.21.0",
|
|
56
57
|
"typescript": "^5.3.0"
|
|
57
58
|
},
|
|
58
59
|
"dependencies": {
|