@typecek/cli 0.1.0 → 1.0.0
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/bin.bundled.js +57 -2
- package/dist/commands/compile.d.ts.map +1 -1
- package/dist/commands/compile.js +2 -1
- package/dist/commands/compile.js.map +1 -1
- package/dist/commands/watch.d.ts.map +1 -1
- package/dist/commands/watch.js +2 -1
- package/dist/commands/watch.js.map +1 -1
- package/dist/format.d.ts +6 -0
- package/dist/format.d.ts.map +1 -0
- package/dist/format.js +55 -0
- package/dist/format.js.map +1 -0
- package/package.json +3 -3
package/dist/bin.bundled.js
CHANGED
|
@@ -213899,6 +213899,59 @@ ${compileBody(node.alternate)}}`;
|
|
|
213899
213899
|
}
|
|
213900
213900
|
});
|
|
213901
213901
|
|
|
213902
|
+
// dist/format.js
|
|
213903
|
+
var require_format = __commonJS({
|
|
213904
|
+
"dist/format.js"(exports2) {
|
|
213905
|
+
"use strict";
|
|
213906
|
+
var __importDefault = exports2 && exports2.__importDefault || function(mod) {
|
|
213907
|
+
return mod && mod.__esModule ? mod : { "default": mod };
|
|
213908
|
+
};
|
|
213909
|
+
Object.defineProperty(exports2, "__esModule", { value: true });
|
|
213910
|
+
exports2.formatWithPrettier = formatWithPrettier;
|
|
213911
|
+
var child_process_1 = require("child_process");
|
|
213912
|
+
var module_1 = require("module");
|
|
213913
|
+
var fs_1 = __importDefault(require("fs"));
|
|
213914
|
+
var path_1 = __importDefault(require("path"));
|
|
213915
|
+
var os_1 = __importDefault(require("os"));
|
|
213916
|
+
var prettierBin;
|
|
213917
|
+
function findPrettierBin() {
|
|
213918
|
+
if (prettierBin !== void 0)
|
|
213919
|
+
return prettierBin;
|
|
213920
|
+
try {
|
|
213921
|
+
const req = (0, module_1.createRequire)(process.cwd() + "/noop.js");
|
|
213922
|
+
const prettierEntry = req.resolve("prettier");
|
|
213923
|
+
prettierBin = prettierEntry.replace(/index\.cjs$/, "bin/prettier.cjs");
|
|
213924
|
+
return prettierBin;
|
|
213925
|
+
} catch {
|
|
213926
|
+
prettierBin = null;
|
|
213927
|
+
return null;
|
|
213928
|
+
}
|
|
213929
|
+
}
|
|
213930
|
+
function formatWithPrettier(code, filepath) {
|
|
213931
|
+
const bin = findPrettierBin();
|
|
213932
|
+
if (!bin)
|
|
213933
|
+
return code;
|
|
213934
|
+
const tmpFile = path_1.default.join(os_1.default.tmpdir(), `typecek-${Date.now()}-${Math.random().toString(36).slice(2)}.ts`);
|
|
213935
|
+
try {
|
|
213936
|
+
fs_1.default.writeFileSync(tmpFile, code);
|
|
213937
|
+
(0, child_process_1.execFileSync)(process.execPath, [bin, "--write", "--parser", "typescript", tmpFile], {
|
|
213938
|
+
encoding: "utf-8",
|
|
213939
|
+
stdio: ["pipe", "pipe", "pipe"],
|
|
213940
|
+
timeout: 1e4
|
|
213941
|
+
});
|
|
213942
|
+
return fs_1.default.readFileSync(tmpFile, "utf-8");
|
|
213943
|
+
} catch {
|
|
213944
|
+
return code;
|
|
213945
|
+
} finally {
|
|
213946
|
+
try {
|
|
213947
|
+
fs_1.default.unlinkSync(tmpFile);
|
|
213948
|
+
} catch {
|
|
213949
|
+
}
|
|
213950
|
+
}
|
|
213951
|
+
}
|
|
213952
|
+
}
|
|
213953
|
+
});
|
|
213954
|
+
|
|
213902
213955
|
// dist/commands/compile.js
|
|
213903
213956
|
var require_compile = __commonJS({
|
|
213904
213957
|
"dist/commands/compile.js"(exports2) {
|
|
@@ -213913,6 +213966,7 @@ var require_compile = __commonJS({
|
|
|
213913
213966
|
var fs_1 = __importDefault(require("fs"));
|
|
213914
213967
|
var path_1 = __importDefault(require("path"));
|
|
213915
213968
|
var compiler_1 = require_dist2();
|
|
213969
|
+
var format_js_1 = require_format();
|
|
213916
213970
|
var red = (s) => `\x1B[31m${s}\x1B[0m`;
|
|
213917
213971
|
var yellow = (s) => `\x1B[33m${s}\x1B[0m`;
|
|
213918
213972
|
var cyan = (s) => `\x1B[36m${s}\x1B[0m`;
|
|
@@ -214032,7 +214086,7 @@ ${loc} - ${red("error")}${bold(":")} ${message}
|
|
|
214032
214086
|
if (!checkOnly) {
|
|
214033
214087
|
const outputDir = path_1.default.dirname(outputPath);
|
|
214034
214088
|
fs_1.default.mkdirSync(outputDir, { recursive: true });
|
|
214035
|
-
fs_1.default.writeFileSync(outputPath, result.code);
|
|
214089
|
+
fs_1.default.writeFileSync(outputPath, (0, format_js_1.formatWithPrettier)(result.code, outputPath));
|
|
214036
214090
|
}
|
|
214037
214091
|
const diagCount = result.diagnostics.filter((d) => d.severity === "error").length;
|
|
214038
214092
|
if (diagCount === 0) {
|
|
@@ -214172,6 +214226,7 @@ var require_watch = __commonJS({
|
|
|
214172
214226
|
var path_1 = __importDefault(require("path"));
|
|
214173
214227
|
var compiler_1 = require_dist2();
|
|
214174
214228
|
var compile_js_1 = require_compile();
|
|
214229
|
+
var format_js_1 = require_format();
|
|
214175
214230
|
function watch() {
|
|
214176
214231
|
const projectRoot = (0, compile_js_1.findTsconfigRoot)();
|
|
214177
214232
|
const sourceRoot = (0, compile_js_1.findSourceRoot)(projectRoot);
|
|
@@ -214197,7 +214252,7 @@ var require_watch = __commonJS({
|
|
|
214197
214252
|
const result = (0, compiler_1.compile)({ template, filename: path_1.default.basename(templatePath) });
|
|
214198
214253
|
const outputDir = path_1.default.dirname(outputPath);
|
|
214199
214254
|
fs_1.default.mkdirSync(outputDir, { recursive: true });
|
|
214200
|
-
fs_1.default.writeFileSync(outputPath, result.code);
|
|
214255
|
+
fs_1.default.writeFileSync(outputPath, (0, format_js_1.formatWithPrettier)(result.code, outputPath));
|
|
214201
214256
|
console.log(` compiled ${relativePath}`);
|
|
214202
214257
|
} catch (err) {
|
|
214203
214258
|
console.error(` error in ${relativePath}: ${err instanceof Error ? err.message : err}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compile.d.ts","sourceRoot":"","sources":["../../src/commands/compile.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"compile.d.ts","sourceRoot":"","sources":["../../src/commands/compile.ts"],"names":[],"mappings":"AAaA,wBAAgB,gBAAgB,IAAI,MAAM,CAOzC;AAED,wBAAgB,cAAc,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,CAoB1D;AA+DD,wBAAgB,UAAU,CAAC,SAAS,UAAQ,GAAG,IAAI,CA0FlD"}
|
package/dist/commands/compile.js
CHANGED
|
@@ -9,6 +9,7 @@ exports.compileAll = compileAll;
|
|
|
9
9
|
const fs_1 = __importDefault(require("fs"));
|
|
10
10
|
const path_1 = __importDefault(require("path"));
|
|
11
11
|
const compiler_1 = require("@typecek/compiler");
|
|
12
|
+
const format_js_1 = require("../format.js");
|
|
12
13
|
// ANSI color helpers
|
|
13
14
|
const red = (s) => `\x1b[31m${s}\x1b[0m`;
|
|
14
15
|
const yellow = (s) => `\x1b[33m${s}\x1b[0m`;
|
|
@@ -132,7 +133,7 @@ function compileAll(checkOnly = false) {
|
|
|
132
133
|
if (!checkOnly) {
|
|
133
134
|
const outputDir = path_1.default.dirname(outputPath);
|
|
134
135
|
fs_1.default.mkdirSync(outputDir, { recursive: true });
|
|
135
|
-
fs_1.default.writeFileSync(outputPath, result.code);
|
|
136
|
+
fs_1.default.writeFileSync(outputPath, (0, format_js_1.formatWithPrettier)(result.code, outputPath));
|
|
136
137
|
}
|
|
137
138
|
const diagCount = result.diagnostics.filter((d) => d.severity === "error").length;
|
|
138
139
|
if (diagCount === 0) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compile.js","sourceRoot":"","sources":["../../src/commands/compile.ts"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"compile.js","sourceRoot":"","sources":["../../src/commands/compile.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"watch.d.ts","sourceRoot":"","sources":["../../src/commands/watch.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"watch.d.ts","sourceRoot":"","sources":["../../src/commands/watch.ts"],"names":[],"mappings":"AAMA,wBAAgB,KAAK,IAAI,IAAI,CAuC5B"}
|
package/dist/commands/watch.js
CHANGED
|
@@ -8,6 +8,7 @@ const fs_1 = __importDefault(require("fs"));
|
|
|
8
8
|
const path_1 = __importDefault(require("path"));
|
|
9
9
|
const compiler_1 = require("@typecek/compiler");
|
|
10
10
|
const compile_js_1 = require("./compile.js");
|
|
11
|
+
const format_js_1 = require("../format.js");
|
|
11
12
|
function watch() {
|
|
12
13
|
const projectRoot = (0, compile_js_1.findTsconfigRoot)();
|
|
13
14
|
const sourceRoot = (0, compile_js_1.findSourceRoot)(projectRoot);
|
|
@@ -35,7 +36,7 @@ function watch() {
|
|
|
35
36
|
const result = (0, compiler_1.compile)({ template, filename: path_1.default.basename(templatePath) });
|
|
36
37
|
const outputDir = path_1.default.dirname(outputPath);
|
|
37
38
|
fs_1.default.mkdirSync(outputDir, { recursive: true });
|
|
38
|
-
fs_1.default.writeFileSync(outputPath, result.code);
|
|
39
|
+
fs_1.default.writeFileSync(outputPath, (0, format_js_1.formatWithPrettier)(result.code, outputPath));
|
|
39
40
|
console.log(` compiled ${relativePath}`);
|
|
40
41
|
}
|
|
41
42
|
catch (err) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"watch.js","sourceRoot":"","sources":["../../src/commands/watch.ts"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"watch.js","sourceRoot":"","sources":["../../src/commands/watch.ts"],"names":[],"mappings":";;;;;AAMA,sBAuCC;AA7CD,4CAAoB;AACpB,gDAAwB;AACxB,gDAA4C;AAC5C,6CAAgE;AAChE,4CAAkD;AAElD,SAAgB,KAAK;IACnB,MAAM,WAAW,GAAG,IAAA,6BAAgB,GAAE,CAAC;IACvC,MAAM,UAAU,GAAG,IAAA,2BAAc,EAAC,WAAW,CAAC,CAAC;IAC/C,MAAM,UAAU,GAAG,cAAI,CAAC,IAAI,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC;IAEtD,OAAO,CAAC,GAAG,CAAC,oCAAoC,cAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,UAAU,CAAC,IAAI,GAAG,KAAK,CAAC,CAAC;IACtG,OAAO,CAAC,GAAG,CAAC,yBAAyB,CAAC,CAAC;IAEvC,YAAE,CAAC,KAAK,CAAC,UAAU,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,EAAE,CAAC,SAAS,EAAE,QAAQ,EAAE,EAAE;QAChE,IAAI,CAAC,QAAQ,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC;YAAE,OAAO;QAEnD,MAAM,YAAY,GAAG,cAAI,CAAC,IAAI,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;QACrD,MAAM,YAAY,GAAG,QAAQ,CAAC;QAC9B,MAAM,cAAc,GAAG,YAAY,CAAC,OAAO,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QAC5D,MAAM,UAAU,GAAG,cAAI,CAAC,IAAI,CAAC,UAAU,EAAE,cAAc,CAAC,CAAC;QAEzD,kBAAkB;QAClB,IAAI,CAAC,YAAE,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE,CAAC;YACjC,IAAI,YAAE,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC;gBAC9B,YAAE,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;gBAC1B,OAAO,CAAC,GAAG,CAAC,aAAa,YAAY,EAAE,CAAC,CAAC;YAC3C,CAAC;YACD,OAAO;QACT,CAAC;QAED,UAAU;QACV,IAAI,CAAC;YACH,MAAM,QAAQ,GAAG,YAAE,CAAC,YAAY,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;YACxD,MAAM,MAAM,GAAG,IAAA,kBAAO,EAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,cAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;YAE5E,MAAM,SAAS,GAAG,cAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;YAC3C,YAAE,CAAC,SAAS,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;YAC7C,YAAE,CAAC,aAAa,CAAC,UAAU,EAAE,IAAA,8BAAkB,EAAC,MAAM,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC,CAAC;YAE1E,OAAO,CAAC,GAAG,CAAC,cAAc,YAAY,EAAE,CAAC,CAAC;QAC5C,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,OAAO,CAAC,KAAK,CAAC,cAAc,YAAY,KAAK,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC;QAC3F,CAAC;IACH,CAAC,CAAC,CAAC;AACL,CAAC"}
|
package/dist/format.d.ts
ADDED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"format.d.ts","sourceRoot":"","sources":["../src/format.ts"],"names":[],"mappings":"AAqBA;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAsBzE"}
|
package/dist/format.js
ADDED
|
@@ -0,0 +1,55 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.formatWithPrettier = formatWithPrettier;
|
|
7
|
+
const child_process_1 = require("child_process");
|
|
8
|
+
const module_1 = require("module");
|
|
9
|
+
const fs_1 = __importDefault(require("fs"));
|
|
10
|
+
const path_1 = __importDefault(require("path"));
|
|
11
|
+
const os_1 = __importDefault(require("os"));
|
|
12
|
+
let prettierBin;
|
|
13
|
+
function findPrettierBin() {
|
|
14
|
+
if (prettierBin !== undefined)
|
|
15
|
+
return prettierBin;
|
|
16
|
+
try {
|
|
17
|
+
const req = (0, module_1.createRequire)(process.cwd() + "/noop.js");
|
|
18
|
+
const prettierEntry = req.resolve("prettier");
|
|
19
|
+
prettierBin = prettierEntry.replace(/index\.cjs$/, "bin/prettier.cjs");
|
|
20
|
+
return prettierBin;
|
|
21
|
+
}
|
|
22
|
+
catch {
|
|
23
|
+
prettierBin = null;
|
|
24
|
+
return null;
|
|
25
|
+
}
|
|
26
|
+
}
|
|
27
|
+
/**
|
|
28
|
+
* Try to format code with the project's prettier installation.
|
|
29
|
+
* Returns the original code unchanged if prettier is not available.
|
|
30
|
+
*/
|
|
31
|
+
function formatWithPrettier(code, filepath) {
|
|
32
|
+
const bin = findPrettierBin();
|
|
33
|
+
if (!bin)
|
|
34
|
+
return code;
|
|
35
|
+
const tmpFile = path_1.default.join(os_1.default.tmpdir(), `typecek-${Date.now()}-${Math.random().toString(36).slice(2)}.ts`);
|
|
36
|
+
try {
|
|
37
|
+
fs_1.default.writeFileSync(tmpFile, code);
|
|
38
|
+
(0, child_process_1.execFileSync)(process.execPath, [bin, "--write", "--parser", "typescript", tmpFile], {
|
|
39
|
+
encoding: "utf-8",
|
|
40
|
+
stdio: ["pipe", "pipe", "pipe"],
|
|
41
|
+
timeout: 10_000,
|
|
42
|
+
});
|
|
43
|
+
return fs_1.default.readFileSync(tmpFile, "utf-8");
|
|
44
|
+
}
|
|
45
|
+
catch {
|
|
46
|
+
return code;
|
|
47
|
+
}
|
|
48
|
+
finally {
|
|
49
|
+
try {
|
|
50
|
+
fs_1.default.unlinkSync(tmpFile);
|
|
51
|
+
}
|
|
52
|
+
catch { }
|
|
53
|
+
}
|
|
54
|
+
}
|
|
55
|
+
//# sourceMappingURL=format.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"format.js","sourceRoot":"","sources":["../src/format.ts"],"names":[],"mappings":";;;;;AAyBA,gDAsBC;AA/CD,iDAA6C;AAC7C,mCAAuC;AACvC,4CAAoB;AACpB,gDAAwB;AACxB,4CAAoB;AAEpB,IAAI,WAAsC,CAAC;AAE3C,SAAS,eAAe;IACtB,IAAI,WAAW,KAAK,SAAS;QAAE,OAAO,WAAW,CAAC;IAClD,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,IAAA,sBAAa,EAAC,OAAO,CAAC,GAAG,EAAE,GAAG,UAAU,CAAC,CAAC;QACtD,MAAM,aAAa,GAAG,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QAC9C,WAAW,GAAG,aAAa,CAAC,OAAO,CAAC,aAAa,EAAE,kBAAkB,CAAC,CAAC;QACvE,OAAO,WAAW,CAAC;IACrB,CAAC;IAAC,MAAM,CAAC;QACP,WAAW,GAAG,IAAI,CAAC;QACnB,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAED;;;GAGG;AACH,SAAgB,kBAAkB,CAAC,IAAY,EAAE,QAAgB;IAC/D,MAAM,GAAG,GAAG,eAAe,EAAE,CAAC;IAC9B,IAAI,CAAC,GAAG;QAAE,OAAO,IAAI,CAAC;IAEtB,MAAM,OAAO,GAAG,cAAI,CAAC,IAAI,CAAC,YAAE,CAAC,MAAM,EAAE,EAAE,WAAW,IAAI,CAAC,GAAG,EAAE,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;IAC1G,IAAI,CAAC;QACH,YAAE,CAAC,aAAa,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QAChC,IAAA,4BAAY,EACV,OAAO,CAAC,QAAQ,EAChB,CAAC,GAAG,EAAE,SAAS,EAAE,UAAU,EAAE,YAAY,EAAE,OAAO,CAAC,EACnD;YACE,QAAQ,EAAE,OAAO;YACjB,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC;YAC/B,OAAO,EAAE,MAAM;SAChB,CACF,CAAC;QACF,OAAO,YAAE,CAAC,YAAY,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAC3C,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;YAAS,CAAC;QACT,IAAI,CAAC;YAAC,YAAE,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;QAAC,CAAC;QAAC,MAAM,CAAC,CAAA,CAAC;IAC1C,CAAC;AACH,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@typecek/cli",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "1.0.0",
|
|
4
4
|
"description": "CLI for Typecek",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -9,8 +9,8 @@
|
|
|
9
9
|
"typecku": "dist/bin.bundled.js"
|
|
10
10
|
},
|
|
11
11
|
"dependencies": {
|
|
12
|
-
"@typecek/core": "
|
|
13
|
-
"@typecek/compiler": "
|
|
12
|
+
"@typecek/core": "1.0.0",
|
|
13
|
+
"@typecek/compiler": "1.0.0"
|
|
14
14
|
},
|
|
15
15
|
"devDependencies": {
|
|
16
16
|
"esbuild": "^0.27.4"
|