tsx-strict 0.4.0-canary → 0.4.0-canary.11
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/compiler-provider.d.ts +4 -0
- package/dist/compiler-provider.d.ts.map +1 -1
- package/dist/compiler-provider.js +79 -43
- package/dist/compiler-provider.js.map +1 -1
- package/dist/file-watcher.d.ts.map +1 -1
- package/dist/file-watcher.js +17 -3
- package/dist/file-watcher.js.map +1 -1
- package/dist/index.d.ts +6 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +17 -8
- package/dist/index.js.map +1 -1
- package/package.json +1 -1
package/dist/cli.js
CHANGED
|
@@ -24,6 +24,7 @@ program
|
|
|
24
24
|
.option("--include <pattern>", "Include glob pattern to watch", collect, [])
|
|
25
25
|
.option("--no-clear", "Do not clear screen", true)
|
|
26
26
|
.option("--compiler <compiler>", "Compiler", "typescript/bin/tsc")
|
|
27
|
+
.option("-p, --path <path>", "tsconfig.json path", "tsconfig.json")
|
|
27
28
|
.option("--tsc-args <args...>", "Additional tsc arguments")
|
|
28
29
|
.option("--tsx-args <args...>", "Additional tsx arguments")
|
|
29
30
|
.option("--no-type-check", "Skip type checking (run tsx directly)", true)
|
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;AAClC,gDAAwB;AAExB,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAC5B,IAAA,iBAAY,EAAC,cAAI,CAAC,OAAO,CAAC,SAAS,EAAE,iBAAiB,CAAC,EAAE,MAAM,CAAC,CACjE,CAAC;AACF,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,IAAI,CAAC,MAAM,CAAC;KACZ,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;AAClC,gDAAwB;AAExB,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAC5B,IAAA,iBAAY,EAAC,cAAI,CAAC,OAAO,CAAC,SAAS,EAAE,iBAAiB,CAAC,EAAE,MAAM,CAAC,CACjE,CAAC;AACF,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,IAAI,CAAC,MAAM,CAAC;KACZ,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,mBAAmB,EAAE,oBAAoB,EAAE,eAAe,CAAC;KAClE,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,2 +1,6 @@
|
|
|
1
1
|
export declare function getCompilerPath(compilerArg: string | null, resolver?: NodeRequire["resolve"]): string;
|
|
2
|
+
export declare function getTsConfigJsonPath(configPath?: string, filePath?: string): string;
|
|
3
|
+
export declare function hasTsConfig(): boolean;
|
|
4
|
+
export declare function isESM(filePath?: string): boolean;
|
|
5
|
+
export declare function getTscArgs(userFilePath: string): string[];
|
|
2
6
|
//# sourceMappingURL=compiler-provider.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compiler-provider.d.ts","sourceRoot":"","sources":["../src/compiler-provider.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"compiler-provider.d.ts","sourceRoot":"","sources":["../src/compiler-provider.ts"],"names":[],"mappings":"AAGA,wBAAgB,eAAe,CAC7B,WAAW,EAAE,MAAM,GAAG,IAAI,EAC1B,QAAQ,GAAE,WAAW,CAAC,SAAS,CAAmB,GACjD,MAAM,CA8CR;AAED,wBAAgB,mBAAmB,CACjC,UAAU,CAAC,EAAE,MAAM,EACnB,QAAQ,CAAC,EAAE,MAAM,GAChB,MAAM,CAcR;AAmBD,wBAAgB,WAAW,IAAI,OAAO,CAGrC;AAED,wBAAgB,KAAK,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAgBhD;AAED,wBAAgB,UAAU,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM,EAAE,CA0BzD"}
|
|
@@ -1,56 +1,35 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
// ): string {
|
|
6
|
-
// if (!compilerArg) compilerArg = "typescript/bin/tsc";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
7
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
8
6
|
exports.getCompilerPath = getCompilerPath;
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
// return resolver(compilerArg);
|
|
16
|
-
// } catch (e: any) {
|
|
17
|
-
// if (e.code === "MODULE_NOT_FOUND") {
|
|
18
|
-
// console.error(e.message);
|
|
19
|
-
// process.exit(9);
|
|
20
|
-
// }
|
|
21
|
-
// throw e;
|
|
22
|
-
// }
|
|
23
|
-
// }
|
|
7
|
+
exports.getTsConfigJsonPath = getTsConfigJsonPath;
|
|
8
|
+
exports.hasTsConfig = hasTsConfig;
|
|
9
|
+
exports.isESM = isESM;
|
|
10
|
+
exports.getTscArgs = getTscArgs;
|
|
11
|
+
const path_1 = __importDefault(require("path"));
|
|
12
|
+
const fs_1 = __importDefault(require("fs"));
|
|
24
13
|
function getCompilerPath(compilerArg, resolver = require.resolve) {
|
|
25
14
|
if (!compilerArg)
|
|
26
15
|
compilerArg = "typescript/bin/tsc";
|
|
27
|
-
// 1. Try local node_modules in current directory
|
|
28
16
|
try {
|
|
29
17
|
return resolver(compilerArg, { paths: [process.cwd()] });
|
|
30
18
|
}
|
|
31
|
-
catch (e) {
|
|
32
|
-
// Continue to next attempt
|
|
33
|
-
}
|
|
34
|
-
// 2. Try parent directories (walk up the tree)
|
|
19
|
+
catch (e) { }
|
|
35
20
|
let currentDir = process.cwd();
|
|
36
|
-
const root =
|
|
21
|
+
const root = path_1.default.parse(currentDir).root;
|
|
37
22
|
while (currentDir !== root) {
|
|
38
23
|
try {
|
|
39
24
|
return resolver(compilerArg, { paths: [currentDir] });
|
|
40
25
|
}
|
|
41
|
-
catch (e) {
|
|
42
|
-
|
|
43
|
-
}
|
|
44
|
-
currentDir = require("path").dirname(currentDir);
|
|
26
|
+
catch (e) { }
|
|
27
|
+
currentDir = path_1.default.dirname(currentDir);
|
|
45
28
|
}
|
|
46
|
-
// 3. Try global node_modules
|
|
47
29
|
try {
|
|
48
30
|
return resolver(compilerArg);
|
|
49
31
|
}
|
|
50
|
-
catch (e) {
|
|
51
|
-
// Continue to next attempt
|
|
52
|
-
}
|
|
53
|
-
// 4. Try common global installation paths
|
|
32
|
+
catch (e) { }
|
|
54
33
|
const globalPaths = [
|
|
55
34
|
`${process.env.HOME}/.nvm/versions/node/${process.version}/lib/node_modules`,
|
|
56
35
|
`${process.env.HOME}/.npm-global/lib/node_modules`,
|
|
@@ -62,23 +41,80 @@ function getCompilerPath(compilerArg, resolver = require.resolve) {
|
|
|
62
41
|
try {
|
|
63
42
|
return resolver(compilerArg, { paths: [globalPath] });
|
|
64
43
|
}
|
|
65
|
-
catch (e) {
|
|
66
|
-
// Continue to next path
|
|
67
|
-
}
|
|
44
|
+
catch (e) { }
|
|
68
45
|
}
|
|
69
|
-
// 5. Final fallback - check if tsc is in PATH
|
|
70
46
|
try {
|
|
71
47
|
const { execSync } = require("child_process");
|
|
72
48
|
const tscPath = execSync("which tsc", { encoding: "utf-8" }).trim();
|
|
73
49
|
if (tscPath)
|
|
74
50
|
return tscPath;
|
|
75
51
|
}
|
|
76
|
-
catch (e) {
|
|
77
|
-
// Continue to error
|
|
78
|
-
}
|
|
79
|
-
// If nothing worked, throw error
|
|
52
|
+
catch (e) { }
|
|
80
53
|
console.error(`Could not find TypeScript compiler at "${compilerArg}"`);
|
|
81
54
|
console.error("Tried local node_modules, parent directories, and global installations");
|
|
82
55
|
process.exit(9);
|
|
83
56
|
}
|
|
57
|
+
function getTsConfigJsonPath(configPath, filePath) {
|
|
58
|
+
if (configPath)
|
|
59
|
+
try {
|
|
60
|
+
fs_1.default.accessSync(configPath);
|
|
61
|
+
return path_1.default.resolve(configPath);
|
|
62
|
+
}
|
|
63
|
+
catch (e) { }
|
|
64
|
+
const isESM = determineModuleType(filePath);
|
|
65
|
+
if (isESM) {
|
|
66
|
+
return path_1.default.resolve(__dirname, "../tsconfigs/tsconfig.esm.json");
|
|
67
|
+
}
|
|
68
|
+
else {
|
|
69
|
+
return path_1.default.resolve(__dirname, "../tsconfigs/tsconfig.cjs.json");
|
|
70
|
+
}
|
|
71
|
+
}
|
|
72
|
+
function determineModuleType(filePath) {
|
|
73
|
+
if (filePath) {
|
|
74
|
+
const ext = path_1.default.extname(filePath);
|
|
75
|
+
if (ext === ".mts" || ext === ".mjs")
|
|
76
|
+
return true;
|
|
77
|
+
if (ext === ".cts" || ext === ".cjs")
|
|
78
|
+
return false;
|
|
79
|
+
}
|
|
80
|
+
try {
|
|
81
|
+
const packageJsonPath = path_1.default.resolve(process.cwd(), "package.json");
|
|
82
|
+
const packageJson = JSON.parse(fs_1.default.readFileSync(packageJsonPath, "utf-8"));
|
|
83
|
+
if (packageJson.type === "module")
|
|
84
|
+
return true;
|
|
85
|
+
}
|
|
86
|
+
catch (e) { }
|
|
87
|
+
return false;
|
|
88
|
+
}
|
|
89
|
+
function hasTsConfig() {
|
|
90
|
+
const tsConfigPath = path_1.default.join(process.cwd(), "tsconfig.json");
|
|
91
|
+
return fs_1.default.existsSync(tsConfigPath);
|
|
92
|
+
}
|
|
93
|
+
function isESM(filePath) {
|
|
94
|
+
// Check file extension
|
|
95
|
+
if (filePath) {
|
|
96
|
+
const ext = path_1.default.extname(filePath);
|
|
97
|
+
if (ext === ".mts" || ext === ".mjs")
|
|
98
|
+
return true;
|
|
99
|
+
if (ext === ".cts" || ext === ".cjs")
|
|
100
|
+
return false;
|
|
101
|
+
}
|
|
102
|
+
// Check package.json
|
|
103
|
+
try {
|
|
104
|
+
const packageJsonPath = path_1.default.join(process.cwd(), "package.json");
|
|
105
|
+
const packageJson = JSON.parse(fs_1.default.readFileSync(packageJsonPath, "utf-8"));
|
|
106
|
+
return packageJson.type === "module";
|
|
107
|
+
}
|
|
108
|
+
catch (e) {
|
|
109
|
+
return false; // Default to CJS
|
|
110
|
+
}
|
|
111
|
+
}
|
|
112
|
+
function getTscArgs(userFilePath) {
|
|
113
|
+
const args = [];
|
|
114
|
+
if (hasTsConfig())
|
|
115
|
+
return args;
|
|
116
|
+
const module = isESM(userFilePath) ? "ES2020" : "commonjs";
|
|
117
|
+
args.push(userFilePath, "--target", "ES2020", "--lib", "ES2020", "--strict", "--module", module, "--esModuleInterop", "--skipLibCheck", "--forceConsistentCasingInFileNames", "--moduleResolution", "node", "--resolveJsonModule", "--noEmit");
|
|
118
|
+
return args;
|
|
119
|
+
}
|
|
84
120
|
//# sourceMappingURL=compiler-provider.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compiler-provider.js","sourceRoot":"","sources":["../src/compiler-provider.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"compiler-provider.js","sourceRoot":"","sources":["../src/compiler-provider.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file-watcher.d.ts","sourceRoot":"","sources":["../src/file-watcher.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"file-watcher.d.ts","sourceRoot":"","sources":["../src/file-watcher.ts"],"names":[],"mappings":"AAMA,wBAAgB,gBAAgB,CAAC,UAAU,EAAE,MAAM,IAAI,QAuDtD;AAED,wBAAgB,eAAe,SAK9B"}
|
package/dist/file-watcher.js
CHANGED
|
@@ -7,6 +7,7 @@ exports.setupFileWatcher = setupFileWatcher;
|
|
|
7
7
|
exports.stopFileWatcher = stopFileWatcher;
|
|
8
8
|
const chokidar_1 = __importDefault(require("chokidar"));
|
|
9
9
|
const sheu_1 = __importDefault(require("./sheu"));
|
|
10
|
+
const _1 = require(".");
|
|
10
11
|
let fileWatcher = null;
|
|
11
12
|
function setupFileWatcher(restartTsx) {
|
|
12
13
|
if (fileWatcher) {
|
|
@@ -32,9 +33,22 @@ function setupFileWatcher(restartTsx) {
|
|
|
32
33
|
: path.startsWith("\\")
|
|
33
34
|
? path.replace("\\", "")
|
|
34
35
|
: path;
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
36
|
+
const status = (0, _1.getStatus)();
|
|
37
|
+
if (!status?.hasTsErrors)
|
|
38
|
+
sheu_1.default.info(`Restarting because of file changes: ${path}`, {
|
|
39
|
+
timestamp: true,
|
|
40
|
+
});
|
|
41
|
+
else
|
|
42
|
+
setTimeout(() => {
|
|
43
|
+
if (status.hasTsErrors) {
|
|
44
|
+
sheu_1.default.warn(`Waiting for TypeScript errors to be fixed in order to restart`, { timestamp: true });
|
|
45
|
+
}
|
|
46
|
+
else {
|
|
47
|
+
sheu_1.default.info(`Restarting because of file changes: ${path}`, {
|
|
48
|
+
timestamp: true,
|
|
49
|
+
});
|
|
50
|
+
}
|
|
51
|
+
}, 500);
|
|
38
52
|
setTimeout(() => {
|
|
39
53
|
isRestarting = false;
|
|
40
54
|
}, 800);
|
package/dist/file-watcher.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file-watcher.js","sourceRoot":"","sources":["../src/file-watcher.ts"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"file-watcher.js","sourceRoot":"","sources":["../src/file-watcher.ts"],"names":[],"mappings":";;;;;AAMA,4CAuDC;AAED,0CAKC;AApED,wDAA+C;AAC/C,kDAA0B;AAC1B,wBAA8B;AAE9B,IAAI,WAAW,GAAqB,IAAI,CAAC;AAEzC,SAAgB,gBAAgB,CAAC,UAAsB;IACrD,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,MAAM,MAAM,GAAG,IAAA,YAAS,GAAE,CAAC;QAE3B,IAAI,CAAC,MAAM,EAAE,WAAW;YACtB,cAAI,CAAC,IAAI,CAAC,uCAAuC,IAAI,EAAE,EAAE;gBACvD,SAAS,EAAE,IAAI;aAChB,CAAC,CAAC;;YAEH,UAAU,CAAC,GAAG,EAAE;gBACd,IAAI,MAAM,CAAC,WAAW,EAAE,CAAC;oBACvB,cAAI,CAAC,IAAI,CACP,+DAA+D,EAC/D,EAAE,SAAS,EAAE,IAAI,EAAE,CACpB,CAAC;gBACJ,CAAC;qBAAM,CAAC;oBACN,cAAI,CAAC,IAAI,CAAC,uCAAuC,IAAI,EAAE,EAAE;wBACvD,SAAS,EAAE,IAAI;qBAChB,CAAC,CAAC;gBACL,CAAC;YACH,CAAC,EAAE,GAAG,CAAC,CAAC;QAEV,UAAU,CAAC,GAAG,EAAE;YACd,YAAY,GAAG,KAAK,CAAC;QACvB,CAAC,EAAE,GAAG,CAAC,CAAC;QACR,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
|
@@ -2,5 +2,11 @@
|
|
|
2
2
|
export declare let tsxKiller: (() => Promise<void>) | null;
|
|
3
3
|
export declare function setTsxKiller(value: typeof tsxKiller): void;
|
|
4
4
|
export declare function getTsxKiller(): (() => Promise<void>) | null;
|
|
5
|
+
export declare let status: {
|
|
6
|
+
hasTsErrors?: boolean;
|
|
7
|
+
} & Record<string, any>;
|
|
8
|
+
export declare function getStatus(): {
|
|
9
|
+
hasTsErrors?: boolean;
|
|
10
|
+
} & Record<string, any>;
|
|
5
11
|
export declare function runTsxStrict(file: string, options: Record<string, any>): Promise<void>;
|
|
6
12
|
//# 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":";AAYA,eAAO,IAAI,SAAS,EAAE,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,GAAG,IAAW,CAAC;AAE1D,wBAAgB,YAAY,CAAC,KAAK,EAAE,OAAO,SAAS,QAEnD;AAED,wBAAgB,YAAY,WANC,OAAO,CAAC,IAAI,CAAC,SAQzC;AAED,wBAAsB,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAYA,eAAO,IAAI,SAAS,EAAE,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,GAAG,IAAW,CAAC;AAE1D,wBAAgB,YAAY,CAAC,KAAK,EAAE,OAAO,SAAS,QAEnD;AAED,wBAAgB,YAAY,WANC,OAAO,CAAC,IAAI,CAAC,SAQzC;AAED,eAAO,IAAI,MAAM,EAAE;IAAE,WAAW,CAAC,EAAE,OAAO,CAAA;CAAE,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAM,CAAC;AAExE,wBAAgB,SAAS;kBAFU,OAAO;wBAIzC;AAED,wBAAsB,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,iBAuK5E"}
|
package/dist/index.js
CHANGED
|
@@ -37,9 +37,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
37
37
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
38
38
|
};
|
|
39
39
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
40
|
-
exports.tsxKiller = void 0;
|
|
40
|
+
exports.status = exports.tsxKiller = void 0;
|
|
41
41
|
exports.setTsxKiller = setTsxKiller;
|
|
42
42
|
exports.getTsxKiller = getTsxKiller;
|
|
43
|
+
exports.getStatus = getStatus;
|
|
43
44
|
exports.runTsxStrict = runTsxStrict;
|
|
44
45
|
const node_cleanup_1 = __importStar(require("node-cleanup"));
|
|
45
46
|
const cross_spawn_1 = __importDefault(require("cross-spawn"));
|
|
@@ -57,8 +58,13 @@ function setTsxKiller(value) {
|
|
|
57
58
|
function getTsxKiller() {
|
|
58
59
|
return exports.tsxKiller;
|
|
59
60
|
}
|
|
61
|
+
exports.status = {};
|
|
62
|
+
function getStatus() {
|
|
63
|
+
return exports.status;
|
|
64
|
+
}
|
|
60
65
|
async function runTsxStrict(file, options) {
|
|
61
|
-
const { clear = true, typeCheck = true, compiler
|
|
66
|
+
const { clear = true, typeCheck = true, compiler, watch = false, tscArgs = "", tsxArgs = "", maxNodeMem, } = options;
|
|
67
|
+
exports.status = { ...options, ...exports.status };
|
|
62
68
|
function runTsxCommand() {
|
|
63
69
|
const tsxArgsArray = [];
|
|
64
70
|
tsxArgsArray.push(file);
|
|
@@ -71,7 +77,7 @@ async function runTsxStrict(file, options) {
|
|
|
71
77
|
tsxArgsArray.length = 0;
|
|
72
78
|
tsxArgsArray.push(...uniqueArgs);
|
|
73
79
|
}
|
|
74
|
-
const tsxCommand =
|
|
80
|
+
const tsxCommand = `${process.env.npm_lifecycle_script === "npx" ? "npx " : ""}tsx ${tsxArgsArray.join(" ")}`;
|
|
75
81
|
if (exports.tsxKiller)
|
|
76
82
|
((0, exports.tsxKiller)?.()).then(() => (exports.tsxKiller = (0, runner_1.run)(tsxCommand)));
|
|
77
83
|
else
|
|
@@ -83,6 +89,7 @@ async function runTsxStrict(file, options) {
|
|
|
83
89
|
const tscArgsArray = [];
|
|
84
90
|
const nodeArgs = maxNodeMem ? [`--max_old_space_size=${maxNodeMem}`] : [];
|
|
85
91
|
tscArgsArray.push((0, compiler_provider_1.getCompilerPath)(compiler));
|
|
92
|
+
tscArgsArray.push(...(0, compiler_provider_1.getTscArgs)(file));
|
|
86
93
|
tscArgsArray.push("--noEmit");
|
|
87
94
|
if (watch)
|
|
88
95
|
tscArgsArray.push("--watch");
|
|
@@ -107,7 +114,7 @@ async function runTsxStrict(file, options) {
|
|
|
107
114
|
tscProcess.stderr.pipe(process.stderr);
|
|
108
115
|
let compilationId = 0;
|
|
109
116
|
let compilationErrorSinceStart = false;
|
|
110
|
-
|
|
117
|
+
exports.status.hasTsErrors = false;
|
|
111
118
|
function restartTsx() {
|
|
112
119
|
compilationId++;
|
|
113
120
|
(0, killer_1.killProcesses)(compilationId).then((previousCompilationId) => {
|
|
@@ -133,9 +140,9 @@ async function runTsxStrict(file, options) {
|
|
|
133
140
|
const compilationError = state.compilationError;
|
|
134
141
|
const compilationCompleteWithoutError = state.compilationCompleteWithoutError;
|
|
135
142
|
if (compilationCompleteWithoutError)
|
|
136
|
-
hasTsErrors = false;
|
|
143
|
+
exports.status.hasTsErrors = false;
|
|
137
144
|
if (compilationError) {
|
|
138
|
-
hasTsErrors = true;
|
|
145
|
+
exports.status.hasTsErrors = true;
|
|
139
146
|
compilationId++;
|
|
140
147
|
(0, killer_1.killProcesses)(compilationId).then((previousCompilationId) => {
|
|
141
148
|
if (previousCompilationId !== compilationId)
|
|
@@ -147,7 +154,7 @@ async function runTsxStrict(file, options) {
|
|
|
147
154
|
(!compilationStarted && compilationErrorSinceStart) || compilationError;
|
|
148
155
|
if (state.fileEmitted !== null)
|
|
149
156
|
Signal.emitFile(state.fileEmitted);
|
|
150
|
-
if (compilationCompleteWithoutError && !hasTsErrors && !firstTime) {
|
|
157
|
+
if (compilationCompleteWithoutError && !exports.status.hasTsErrors && !firstTime) {
|
|
151
158
|
compilationId++;
|
|
152
159
|
(0, killer_1.killProcesses)(compilationId).then((previousCompilationId) => {
|
|
153
160
|
if (previousCompilationId !== compilationId)
|
|
@@ -160,7 +167,9 @@ async function runTsxStrict(file, options) {
|
|
|
160
167
|
}
|
|
161
168
|
});
|
|
162
169
|
}
|
|
163
|
-
else if (firstTime &&
|
|
170
|
+
else if (firstTime &&
|
|
171
|
+
compilationCompleteWithoutError &&
|
|
172
|
+
!exports.status.hasTsErrors) {
|
|
164
173
|
firstTime = false;
|
|
165
174
|
Signal.emitFirstSuccess();
|
|
166
175
|
}
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAcA,oCAEC;AAED,oCAEC;AAED,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|