@tui-sandbox/library 13.0.1 → 13.0.3
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/browser/assets/index--RUYD7w0.js +24 -0
- package/dist/browser/index.html +1 -1
- package/dist/src/browser/neovim-client.js +10 -8
- package/dist/src/browser/neovim-client.js.map +1 -1
- package/dist/src/client/BatchedAsyncQueue.js +2 -1
- package/dist/src/client/BatchedAsyncQueue.js.map +1 -1
- package/dist/src/client/BatchedAsyncQueue.test.js +9 -8
- package/dist/src/client/BatchedAsyncQueue.test.js.map +1 -1
- package/dist/src/client/neovim/MyNeovimConfigModification.test.js.map +1 -1
- package/dist/src/scripts/commands/commandTuiStart.d.ts +2 -2
- package/dist/src/scripts/commands/commandTuiStart.js +5 -6
- package/dist/src/scripts/commands/commandTuiStart.js.map +1 -1
- package/dist/src/scripts/parseArguments.js +1 -0
- package/dist/src/scripts/parseArguments.js.map +1 -1
- package/dist/src/scripts/resolveConfig.test.js +17 -7
- package/dist/src/scripts/resolveConfig.test.js.map +1 -1
- package/dist/src/scripts/tui.js +2 -2
- package/dist/src/scripts/tui.js.map +1 -1
- package/dist/src/server/TestServer.js +8 -4
- package/dist/src/server/TestServer.js.map +1 -1
- package/dist/src/server/applications/neovim/NeovimApplication.js +2 -1
- package/dist/src/server/applications/neovim/NeovimApplication.js.map +1 -1
- package/dist/src/server/applications/neovim/NeovimJavascriptApiClient.js +3 -0
- package/dist/src/server/applications/neovim/NeovimJavascriptApiClient.js.map +1 -1
- package/dist/src/server/applications/neovim/NeovimJavascriptApiClient.test.js +1 -0
- package/dist/src/server/applications/neovim/NeovimJavascriptApiClient.test.js.map +1 -1
- package/dist/src/server/applications/neovim/api.js +2 -1
- package/dist/src/server/applications/neovim/api.js.map +1 -1
- package/dist/src/server/applications/neovim/environment/TempDirectory.d.ts +2 -2
- package/dist/src/server/applications/neovim/environment/TempDirectory.js +3 -2
- package/dist/src/server/applications/neovim/environment/TempDirectory.js.map +1 -1
- package/dist/src/server/applications/neovim/environment/XdgRuntimeDirectory.test.js +9 -7
- package/dist/src/server/applications/neovim/environment/XdgRuntimeDirectory.test.js.map +1 -1
- package/dist/src/server/applications/neovim/environment/createTempDir.test.js +4 -2
- package/dist/src/server/applications/neovim/environment/createTempDir.test.js.map +1 -1
- package/dist/src/server/applications/neovim/environment/resolveMiseBinPaths.js +12 -1
- package/dist/src/server/applications/neovim/environment/resolveMiseBinPaths.js.map +1 -1
- package/dist/src/server/applications/neovim/environment/resolveMiseBinPaths.test.js +6 -12
- package/dist/src/server/applications/neovim/environment/resolveMiseBinPaths.test.js.map +1 -1
- package/dist/src/server/applications/neovim/neovimRouter.js +4 -4
- package/dist/src/server/applications/neovim/neovimRouter.js.map +1 -1
- package/dist/src/server/applications/terminal/terminalRouter.js +2 -2
- package/dist/src/server/applications/terminal/terminalRouter.js.map +1 -1
- package/dist/src/server/dirtree/index.test.js +4 -2
- package/dist/src/server/dirtree/index.test.js.map +1 -1
- package/dist/src/server/dirtree/json-to-zod.js +52 -44
- package/dist/src/server/dirtree/json-to-zod.js.map +1 -1
- package/dist/src/server/updateTestdirectorySchemaFile.test.js +2 -0
- package/dist/src/server/updateTestdirectorySchemaFile.test.js.map +1 -1
- package/dist/src/server/utilities/DisposableSingleApplication.test.js +1 -1
- package/dist/src/server/utilities/DisposableSingleApplication.test.js.map +1 -1
- package/dist/src/server/utilities/format.js +3 -3
- package/dist/src/server/utilities/format.js.map +1 -1
- package/dist/src/server/utilities/generator.js +1 -0
- package/dist/src/server/utilities/generator.js.map +1 -1
- package/dist/src/server/utilities/timeout.js +1 -1
- package/dist/src/server/utilities/timeout.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +13 -13
- package/src/server/cypress-support/tui-sandbox-template.ts +7 -7
- package/dist/browser/assets/index-7yZ7k9tL.js +0 -62
|
@@ -71,7 +71,7 @@ const symlinkFileExists = (path) => {
|
|
|
71
71
|
it("creates a uniquely named directory under the system temp dir", async () => {
|
|
72
72
|
const env_1 = { stack: [], error: void 0, hasError: false };
|
|
73
73
|
try {
|
|
74
|
-
const testDir = __addDisposableResource(env_1, newTestDir(),
|
|
74
|
+
const testDir = __addDisposableResource(env_1, newTestDir(), true);
|
|
75
75
|
const dir = __addDisposableResource(env_1, await XdgRuntimeDirectory.create(testDir.path), true);
|
|
76
76
|
expect(existsSync(dir.path)).toBe(true);
|
|
77
77
|
expect(dir.path).toContain("tui-xdg-");
|
|
@@ -89,7 +89,7 @@ it("creates a uniquely named directory under the system temp dir", async () => {
|
|
|
89
89
|
it("removes the directory and the symlink when disposed", async () => {
|
|
90
90
|
const env_2 = { stack: [], error: void 0, hasError: false };
|
|
91
91
|
try {
|
|
92
|
-
const testDir = __addDisposableResource(env_2, newTestDir(),
|
|
92
|
+
const testDir = __addDisposableResource(env_2, newTestDir(), true);
|
|
93
93
|
let createdPath;
|
|
94
94
|
let createdSymlinkPath;
|
|
95
95
|
{
|
|
@@ -121,7 +121,9 @@ it("removes the directory and the symlink when disposed", async () => {
|
|
|
121
121
|
env_2.hasError = true;
|
|
122
122
|
}
|
|
123
123
|
finally {
|
|
124
|
-
__disposeResources(env_2);
|
|
124
|
+
const result_3 = __disposeResources(env_2);
|
|
125
|
+
if (result_3)
|
|
126
|
+
await result_3;
|
|
125
127
|
}
|
|
126
128
|
});
|
|
127
129
|
it("rejects (and does not leak a temp dir) when the symlink cannot be created", async () => {
|
|
@@ -136,7 +138,7 @@ it("stays well under the OS Unix-socket path limit (this is the reason it exists
|
|
|
136
138
|
// `/yazi+<uid>/.dds.sock`). The full socket path must fit in `sun_path`
|
|
137
139
|
// (~104 bytes on macOS, ~108 on Linux), so the directory itself must leave
|
|
138
140
|
// ample room.
|
|
139
|
-
const testDir = __addDisposableResource(env_4, newTestDir(),
|
|
141
|
+
const testDir = __addDisposableResource(env_4, newTestDir(), true);
|
|
140
142
|
const dir = __addDisposableResource(env_4, await XdgRuntimeDirectory.create(testDir.path), true);
|
|
141
143
|
const exampleSocketPath = join(dir.path, "yazi+1000", ".dds.sock");
|
|
142
144
|
// Use the stricter macOS limit as the bound so it holds on both platforms.
|
|
@@ -147,9 +149,9 @@ it("stays well under the OS Unix-socket path limit (this is the reason it exists
|
|
|
147
149
|
env_4.hasError = true;
|
|
148
150
|
}
|
|
149
151
|
finally {
|
|
150
|
-
const
|
|
151
|
-
if (
|
|
152
|
-
await
|
|
152
|
+
const result_4 = __disposeResources(env_4);
|
|
153
|
+
if (result_4)
|
|
154
|
+
await result_4;
|
|
153
155
|
}
|
|
154
156
|
});
|
|
155
157
|
//# sourceMappingURL=XdgRuntimeDirectory.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"XdgRuntimeDirectory.test.js","sourceRoot":"","sources":["../../../../../../src/server/applications/neovim/environment/XdgRuntimeDirectory.test.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,IAAI,CAAA;AAC1C,OAAO,EAAE,MAAM,EAAE,MAAM,IAAI,CAAA;AAC3B,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAA;AAE3B,OAAO,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAA;AAEnC,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;AAElD,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAA;AAE9D,MAAM,UAAU,GAAG,GAAG,EAAE,CAAC,aAAa,CAAC,MAAM,CAAC,WAAW,CAAC,CAAA;AAE1D;;iFAEiF;AACjF,MAAM,iBAAiB,GAAG,CAAC,IAAY,EAAW,EAAE;IAClD,IAAI,CAAC;QACH,OAAO,SAAS,CAAC,IAAI,CAAC,CAAC,cAAc,EAAE,CAAA;IACzC,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAA;IACd,CAAC;AACH,CAAC,CAAA;AAED,EAAE,CAAC,8DAA8D,EAAE,KAAK,IAAI,EAAE;;;QAC5E,
|
|
1
|
+
{"version":3,"file":"XdgRuntimeDirectory.test.js","sourceRoot":"","sources":["../../../../../../src/server/applications/neovim/environment/XdgRuntimeDirectory.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -60,7 +60,7 @@ it("should create a temp dir with no contents", async () => {
|
|
|
60
60
|
const env_1 = { stack: [], error: void 0, hasError: false };
|
|
61
61
|
try {
|
|
62
62
|
// typically the user will want to have contents, but this should not be an error
|
|
63
|
-
const dir = __addDisposableResource(env_1, TempDirectory.create(),
|
|
63
|
+
const dir = __addDisposableResource(env_1, TempDirectory.create(), true);
|
|
64
64
|
const result = await createTempDir({
|
|
65
65
|
...createDefaultConfig("cwd", {}),
|
|
66
66
|
directories: {
|
|
@@ -79,7 +79,9 @@ it("should create a temp dir with no contents", async () => {
|
|
|
79
79
|
env_1.hasError = true;
|
|
80
80
|
}
|
|
81
81
|
finally {
|
|
82
|
-
__disposeResources(env_1);
|
|
82
|
+
const result_1 = __disposeResources(env_1);
|
|
83
|
+
if (result_1)
|
|
84
|
+
await result_1;
|
|
83
85
|
}
|
|
84
86
|
});
|
|
85
87
|
//# sourceMappingURL=createTempDir.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createTempDir.test.js","sourceRoot":"","sources":["../../../../../../src/server/applications/neovim/environment/createTempDir.test.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,OAAO,QAAQ,MAAM,MAAM,CAAA;AAG3B,OAAO,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAA;AAEvC,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAA;AAGxD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;AAElD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;AAElD,EAAE,CAAC,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,kBAAkB,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAA;AAEpD,EAAE,CAAC,2CAA2C,EAAE,KAAK,IAAI,EAAE;;;QACzD,iFAAiF;QACjF,
|
|
1
|
+
{"version":3,"file":"createTempDir.test.js","sourceRoot":"","sources":["../../../../../../src/server/applications/neovim/environment/createTempDir.test.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,OAAO,QAAQ,MAAM,MAAM,CAAA;AAG3B,OAAO,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAA;AAEvC,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAA;AAGxD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;AAElD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;AAElD,EAAE,CAAC,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,kBAAkB,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAA;AAEpD,EAAE,CAAC,2CAA2C,EAAE,KAAK,IAAI,EAAE;;;QACzD,iFAAiF;QACjF,MAAY,GAAG,kCAAG,aAAa,CAAC,MAAM,EAAE,OAAA,CAAA;QACxC,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC;YACjC,GAAG,mBAAmB,CAAC,KAAK,EAAE,EAAE,CAAC;YACjC,WAAW,EAAE;gBACX,mBAAmB,EAAE,GAAG,CAAC,IAAI;gBAC7B,cAAc,EAAE,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,oBAAoB,CAAC;gBAC7D,iBAAiB,EAAE,QAAQ;aAC5B;SACsC,CAAC,CAAA;QAE1C,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;QACnC,MAAM,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;QACpD,MAAM,CAAC,MAAM,CAAC,mBAAmB,CAAC,QAAQ,CAAC,gBAA4C,CAAC,CAAC,CAAC,UAAU,EAAE,CAAA;QACtG,MAAM,CAAC,MAAM,CAAC,2BAA2B,CAAC,QAAQ,CAAC,UAAiC,CAAC,CAAC,CAAC,UAAU,EAAE,CAAA;;;;;;;;;;;CACpG,CAAC,CAAA"}
|
|
@@ -20,7 +20,18 @@ export const resolveMiseBinPaths = (cwd = process.cwd(), environment = process.e
|
|
|
20
20
|
const cached = cache.get(cwd);
|
|
21
21
|
if (cached)
|
|
22
22
|
return cached;
|
|
23
|
-
|
|
23
|
+
let paths;
|
|
24
|
+
try {
|
|
25
|
+
paths = run(cwd, environment);
|
|
26
|
+
}
|
|
27
|
+
catch (err) {
|
|
28
|
+
// Support cases where mise is used for local development but not installed
|
|
29
|
+
// in CI.
|
|
30
|
+
log(`Failed to resolve mise bin paths from ${cwd}`, err);
|
|
31
|
+
console.warn(`Failed to resolve mise bin paths from ${cwd}: ${JSON.stringify(err)}`);
|
|
32
|
+
paths = "";
|
|
33
|
+
}
|
|
34
|
+
const binPaths = parseMiseBinPaths(paths);
|
|
24
35
|
log(`Resolved ${binPaths.length} mise bin path(s) from ${cwd}`);
|
|
25
36
|
cache.set(cwd, binPaths);
|
|
26
37
|
return binPaths;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolveMiseBinPaths.js","sourceRoot":"","sources":["../../../../../../src/server/applications/neovim/environment/resolveMiseBinPaths.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAA;AAC5C,OAAO,IAAI,MAAM,MAAM,CAAA;AACvB,OAAO,EAAE,QAAQ,EAAE,MAAM,MAAM,CAAA;AAE/B,MAAM,GAAG,GAAG,QAAQ,CAAC,kBAAkB,CAAC,CAAA;AA0BxC,MAAM,eAAe,GAAoB,CAAC,GAAG,EAAE,WAAW,EAAE,EAAE,CAC5D,YAAY,CAAC,MAAM,EAAE,CAAC,WAAW,CAAC,EAAE;IAClC,GAAG;IACH,GAAG,EAAE,WAAW;IAChB,QAAQ,EAAE,MAAM;IAChB,KAAK,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC;CAClC,CAAC,CAAA;AAEJ,+DAA+D;AAC/D,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,MAAc,EAAY,EAAE,CAC5D,MAAM;KACH,KAAK,CAAC,IAAI,CAAC;KACX,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;KACxB,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAA;AAEpC,6EAA6E;AAC7E,wEAAwE;AACxE,MAAM,KAAK,GAAG,IAAI,GAAG,EAAoB,CAAA;AAEzC,MAAM,CAAC,MAAM,mBAAmB,GAAG,CACjC,MAAc,OAAO,CAAC,GAAG,EAAE,EAC3B,cAAiC,OAAO,CAAC,GAAG,EAC5C,MAAuB,eAAe,EAC5B,EAAE;IACZ,MAAM,MAAM,GAAG,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;IAC7B,IAAI,MAAM;QAAE,OAAO,MAAM,CAAA;IAEzB,
|
|
1
|
+
{"version":3,"file":"resolveMiseBinPaths.js","sourceRoot":"","sources":["../../../../../../src/server/applications/neovim/environment/resolveMiseBinPaths.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAA;AAC5C,OAAO,IAAI,MAAM,MAAM,CAAA;AACvB,OAAO,EAAE,QAAQ,EAAE,MAAM,MAAM,CAAA;AAE/B,MAAM,GAAG,GAAG,QAAQ,CAAC,kBAAkB,CAAC,CAAA;AA0BxC,MAAM,eAAe,GAAoB,CAAC,GAAG,EAAE,WAAW,EAAE,EAAE,CAC5D,YAAY,CAAC,MAAM,EAAE,CAAC,WAAW,CAAC,EAAE;IAClC,GAAG;IACH,GAAG,EAAE,WAAW;IAChB,QAAQ,EAAE,MAAM;IAChB,KAAK,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC;CAClC,CAAC,CAAA;AAEJ,+DAA+D;AAC/D,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,MAAc,EAAY,EAAE,CAC5D,MAAM;KACH,KAAK,CAAC,IAAI,CAAC;KACX,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;KACxB,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAA;AAEpC,6EAA6E;AAC7E,wEAAwE;AACxE,MAAM,KAAK,GAAG,IAAI,GAAG,EAAoB,CAAA;AAEzC,MAAM,CAAC,MAAM,mBAAmB,GAAG,CACjC,MAAc,OAAO,CAAC,GAAG,EAAE,EAC3B,cAAiC,OAAO,CAAC,GAAG,EAC5C,MAAuB,eAAe,EAC5B,EAAE;IACZ,MAAM,MAAM,GAAG,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;IAC7B,IAAI,MAAM;QAAE,OAAO,MAAM,CAAA;IAEzB,IAAI,KAAa,CAAA;IACjB,IAAI,CAAC;QACH,KAAK,GAAG,GAAG,CAAC,GAAG,EAAE,WAAW,CAAC,CAAA;IAC/B,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,2EAA2E;QAC3E,SAAS;QACT,GAAG,CAAC,yCAAyC,GAAG,EAAE,EAAE,GAAG,CAAC,CAAA;QACxD,OAAO,CAAC,IAAI,CAAC,yCAAyC,GAAG,KAAK,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;QACpF,KAAK,GAAG,EAAE,CAAA;IACZ,CAAC;IACD,MAAM,QAAQ,GAAa,iBAAiB,CAAC,KAAK,CAAC,CAAA;IACnD,GAAG,CAAC,YAAY,QAAQ,CAAC,MAAM,0BAA0B,GAAG,EAAE,CAAC,CAAA;IAC/D,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAA;IACxB,OAAO,QAAQ,CAAA;AACjB,CAAC,CAAA;AAED,+EAA+E;AAC/E,MAAM,CAAC,MAAM,sBAAsB,GAAG,GAAS,EAAE;IAC/C,KAAK,CAAC,KAAK,EAAE,CAAA;AACf,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,yBAAyB,GAAG,CAAC,GAA2B,EAAE,QAAkB,EAA0B,EAAE;IACnH,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,GAAG,CAAA;IACrC,MAAM,QAAQ,GAAG,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,CAAA;IAClC,OAAO;QACL,GAAG,GAAG;QACN,IAAI,EAAE,CAAC,GAAG,QAAQ,EAAE,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC;KAC1E,CAAA;AACH,CAAC,CAAA"}
|
|
@@ -20,18 +20,12 @@ it("memoizes per working directory (only shells out once)", () => {
|
|
|
20
20
|
resolveMiseBinPaths("/repo", {}, run);
|
|
21
21
|
expect(calls).toBe(1);
|
|
22
22
|
});
|
|
23
|
-
it("
|
|
24
|
-
//
|
|
25
|
-
//
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
})).toThrow(/ENOENT/);
|
|
30
|
-
});
|
|
31
|
-
it("crashes when `mise bin-paths` exits non-zero", () => {
|
|
32
|
-
expect(() => resolveMiseBinPaths("/repo", {}, () => {
|
|
33
|
-
throw new Error("Command failed");
|
|
34
|
-
})).toThrow(/Command failed/);
|
|
23
|
+
it("no-ops when mise is not installed", () => {
|
|
24
|
+
// Support cases where mise is used for local development but not installed
|
|
25
|
+
// in CI.
|
|
26
|
+
expect(resolveMiseBinPaths("/repo", {}, () => {
|
|
27
|
+
throw Object.assign(new Error("(test) spawn mise ENOENT"), { code: "ENOENT" });
|
|
28
|
+
})).toEqual([]);
|
|
35
29
|
});
|
|
36
30
|
it("prepends bin paths so mise-managed tools win over system copies", () => {
|
|
37
31
|
const env = prependMiseBinPathsToPath({ PATH: "/usr/bin:/bin" }, ["/mise/lazygit/bin", "/mise/delta/bin"]);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolveMiseBinPaths.test.js","sourceRoot":"","sources":["../../../../../../src/server/applications/neovim/environment/resolveMiseBinPaths.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAA;AAE9C,OAAO,EACL,sBAAsB,EACtB,iBAAiB,EACjB,yBAAyB,EACzB,mBAAmB,GACpB,MAAM,0BAA0B,CAAA;AAEjC,SAAS,CAAC,GAAG,EAAE;IACb,sBAAsB,EAAE,CAAA;AAC1B,CAAC,CAAC,CAAA;AAEF,EAAE,CAAC,4DAA4D,EAAE,GAAG,EAAE;IACpE,MAAM,CAAC,iBAAiB,CAAC,gCAAgC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAA;AACrG,CAAC,CAAC,CAAA;AAEF,EAAE,CAAC,gDAAgD,EAAE,GAAG,EAAE;IACxD,MAAM,QAAQ,GAAG,mBAAmB,CAAC,OAAO,EAAE,EAAE,EAAE,GAAG,EAAE,CAAC,kBAAkB,CAAC,CAAA;IAC3E,MAAM,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAA;AAChD,CAAC,CAAC,CAAA;AAEF,EAAE,CAAC,uDAAuD,EAAE,GAAG,EAAE;IAC/D,IAAI,KAAK,GAAG,CAAC,CAAA;IACb,MAAM,GAAG,GAAG,GAAW,EAAE;QACvB,KAAK,EAAE,CAAA;QACP,OAAO,UAAU,CAAA;IACnB,CAAC,CAAA;IACD,mBAAmB,CAAC,OAAO,EAAE,EAAE,EAAE,GAAG,CAAC,CAAA;IACrC,mBAAmB,CAAC,OAAO,EAAE,EAAE,EAAE,GAAG,CAAC,CAAA;IACrC,MAAM,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;AACvB,CAAC,CAAC,CAAA;AAEF,EAAE,CAAC,
|
|
1
|
+
{"version":3,"file":"resolveMiseBinPaths.test.js","sourceRoot":"","sources":["../../../../../../src/server/applications/neovim/environment/resolveMiseBinPaths.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAA;AAE9C,OAAO,EACL,sBAAsB,EACtB,iBAAiB,EACjB,yBAAyB,EACzB,mBAAmB,GACpB,MAAM,0BAA0B,CAAA;AAEjC,SAAS,CAAC,GAAG,EAAE;IACb,sBAAsB,EAAE,CAAA;AAC1B,CAAC,CAAC,CAAA;AAEF,EAAE,CAAC,4DAA4D,EAAE,GAAG,EAAE;IACpE,MAAM,CAAC,iBAAiB,CAAC,gCAAgC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAA;AACrG,CAAC,CAAC,CAAA;AAEF,EAAE,CAAC,gDAAgD,EAAE,GAAG,EAAE;IACxD,MAAM,QAAQ,GAAG,mBAAmB,CAAC,OAAO,EAAE,EAAE,EAAE,GAAG,EAAE,CAAC,kBAAkB,CAAC,CAAA;IAC3E,MAAM,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAA;AAChD,CAAC,CAAC,CAAA;AAEF,EAAE,CAAC,uDAAuD,EAAE,GAAG,EAAE;IAC/D,IAAI,KAAK,GAAG,CAAC,CAAA;IACb,MAAM,GAAG,GAAG,GAAW,EAAE;QACvB,KAAK,EAAE,CAAA;QACP,OAAO,UAAU,CAAA;IACnB,CAAC,CAAA;IACD,mBAAmB,CAAC,OAAO,EAAE,EAAE,EAAE,GAAG,CAAC,CAAA;IACrC,mBAAmB,CAAC,OAAO,EAAE,EAAE,EAAE,GAAG,CAAC,CAAA;IACrC,MAAM,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;AACvB,CAAC,CAAC,CAAA;AAEF,EAAE,CAAC,mCAAmC,EAAE,GAAG,EAAE;IAC3C,2EAA2E;IAC3E,SAAS;IACT,MAAM,CACJ,mBAAmB,CAAC,OAAO,EAAE,EAAE,EAAE,GAAG,EAAE;QACpC,MAAM,MAAM,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,0BAA0B,CAAC,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAA;IAChF,CAAC,CAAC,CACH,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;AACf,CAAC,CAAC,CAAA;AAEF,EAAE,CAAC,iEAAiE,EAAE,GAAG,EAAE;IACzE,MAAM,GAAG,GAAG,yBAAyB,CAAC,EAAE,IAAI,EAAE,eAAe,EAAE,EAAE,CAAC,mBAAmB,EAAE,iBAAiB,CAAC,CAAC,CAAA;IAC1G,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,iDAAiD,CAAC,CAAA;AAC7E,CAAC,CAAC,CAAA;AAEF,EAAE,CAAC,sDAAsD,EAAE,GAAG,EAAE;IAC9D,MAAM,QAAQ,GAAG,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,YAAY,EAAE,CAAA;IACzD,MAAM,CAAC,yBAAyB,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;AACnE,CAAC,CAAC,CAAA;AAEF,EAAE,CAAC,wBAAwB,EAAE,GAAG,EAAE;IAChC,MAAM,CAAC,yBAAyB,CAAC,EAAE,IAAI,EAAE,YAAY,EAAE,EAAE,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;QACvF,IAAI,EAAE,YAAY;QAClB,IAAI,EAAE,mBAAmB;KAC1B,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA"}
|
|
@@ -51,23 +51,23 @@ export function createNeovimRouter(config) {
|
|
|
51
51
|
.mutation(async (options) => {
|
|
52
52
|
return neovim.start(options.input.startNeovimArguments, options.input.terminalDimensions, options.input.tabId, config);
|
|
53
53
|
}),
|
|
54
|
-
onStdout: trpc.procedure.input(z.object({ client: tabIdSchema })).subscription(options => {
|
|
54
|
+
onStdout: trpc.procedure.input(z.object({ client: tabIdSchema })).subscription(async (options) => {
|
|
55
55
|
return neovim.initializeStdout(options.input, options.signal, config.directories.testEnvironmentPath);
|
|
56
56
|
}),
|
|
57
|
-
sendStdin: trpc.procedure.input(z.object({ tabId: tabIdSchema, data: z.string() })).mutation(options => {
|
|
57
|
+
sendStdin: trpc.procedure.input(z.object({ tabId: tabIdSchema, data: z.string() })).mutation(async (options) => {
|
|
58
58
|
return neovim.sendStdin(options.input);
|
|
59
59
|
}),
|
|
60
60
|
runBlockingShellCommand: trpc.procedure.input(blockingCommandInputSchema).mutation(async (options) => {
|
|
61
61
|
return neovim.runBlockingShellCommand(config, options.signal, options.input, options.input.allowFailure ?? false);
|
|
62
62
|
}),
|
|
63
|
-
runLuaCode: trpc.procedure.input(luaCodeInputSchema).mutation(options => {
|
|
63
|
+
runLuaCode: trpc.procedure.input(luaCodeInputSchema).mutation(async (options) => {
|
|
64
64
|
return timeoutable(10_000, neovim.runLuaCode(options.input));
|
|
65
65
|
}),
|
|
66
66
|
waitForLuaCode: trpc.procedure.input(pollLuaCodeInputSchema).mutation(async (options) => {
|
|
67
67
|
const result = await timeoutable(options.input.timeoutMs, neovim.waitForLuaCode(options.input, options.signal));
|
|
68
68
|
return result;
|
|
69
69
|
}),
|
|
70
|
-
runExCommand: trpc.procedure.input(exCommandInputSchema).mutation(options => {
|
|
70
|
+
runExCommand: trpc.procedure.input(exCommandInputSchema).mutation(async (options) => {
|
|
71
71
|
return timeoutable(10_000, neovim.runExCommand(options.input));
|
|
72
72
|
}),
|
|
73
73
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"neovimRouter.js","sourceRoot":"","sources":["../../../../../src/server/applications/neovim/neovimRouter.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"neovimRouter.js","sourceRoot":"","sources":["../../../../../src/server/applications/neovim/neovimRouter.ts"],"names":[],"mappings":"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"}
|
|
@@ -19,7 +19,7 @@ const startTerminalInputSchema = z.object({
|
|
|
19
19
|
// oxlint-disable-next-line explicit-module-boundary-types
|
|
20
20
|
export function createTerminalRouter(config) {
|
|
21
21
|
const terminalRouter = trpc.router({
|
|
22
|
-
onStdout: trpc.procedure.input(z.object({ client: tabIdSchema })).subscription(options => {
|
|
22
|
+
onStdout: trpc.procedure.input(z.object({ client: tabIdSchema })).subscription(async (options) => {
|
|
23
23
|
return terminal.initializeStdout(options.input, options.signal);
|
|
24
24
|
}),
|
|
25
25
|
start: trpc.procedure
|
|
@@ -28,7 +28,7 @@ export function createTerminalRouter(config) {
|
|
|
28
28
|
.mutation(async (options) => {
|
|
29
29
|
return terminal.start(options.input, config);
|
|
30
30
|
}),
|
|
31
|
-
sendStdin: trpc.procedure.input(z.object({ tabId: tabIdSchema, data: z.string() })).mutation(options => {
|
|
31
|
+
sendStdin: trpc.procedure.input(z.object({ tabId: tabIdSchema, data: z.string() })).mutation(async (options) => {
|
|
32
32
|
return terminal.sendStdin(options.input);
|
|
33
33
|
}),
|
|
34
34
|
runBlockingShellCommand: trpc.procedure.input(blockingCommandInputSchema).mutation(async (options) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"terminalRouter.js","sourceRoot":"","sources":["../../../../../src/server/applications/terminal/terminalRouter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,KAAK,CAAA;AAExB,OAAO,EAAE,0BAA0B,EAAE,MAAM,qCAAqC,CAAA;AAChF,OAAO,EAAE,IAAI,EAAE,MAAM,0BAA0B,CAAA;AAC/C,OAAO,EAAE,yBAAyB,EAAE,MAAM,gBAAgB,CAAA;AAE1D,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAA;AACtD,OAAO,KAAK,QAAQ,MAAM,UAAU,CAAA;AAEpC,MAAM,wBAAwB,GAAG,CAAC,CAAC,MAAM,CAAC;IACxC,KAAK,EAAE,WAAW;IAClB,sBAAsB,EAAE,CAAC,CAAC,MAAM,CAAC;QAC/B,YAAY,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;QACjC,8BAA8B,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,QAAQ,EAAE;QAC3E,kBAAkB,EAAE,CAAC,CAAC,MAAM,CAAC;YAC3B,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE;YAChB,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE;SACjB,CAAC;KACH,CAAC;CACH,CAAC,CAAA;AAGF,+DAA+D;AAC/D,0DAA0D;AAC1D,MAAM,UAAU,oBAAoB,CAAC,MAAwB;IAC3D,MAAM,cAAc,GAAG,IAAI,CAAC,MAAM,CAAC;QACjC,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,WAAW,EAAE,CAAC,CAAC,CAAC,YAAY,CAAC,OAAO,
|
|
1
|
+
{"version":3,"file":"terminalRouter.js","sourceRoot":"","sources":["../../../../../src/server/applications/terminal/terminalRouter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,KAAK,CAAA;AAExB,OAAO,EAAE,0BAA0B,EAAE,MAAM,qCAAqC,CAAA;AAChF,OAAO,EAAE,IAAI,EAAE,MAAM,0BAA0B,CAAA;AAC/C,OAAO,EAAE,yBAAyB,EAAE,MAAM,gBAAgB,CAAA;AAE1D,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAA;AACtD,OAAO,KAAK,QAAQ,MAAM,UAAU,CAAA;AAEpC,MAAM,wBAAwB,GAAG,CAAC,CAAC,MAAM,CAAC;IACxC,KAAK,EAAE,WAAW;IAClB,sBAAsB,EAAE,CAAC,CAAC,MAAM,CAAC;QAC/B,YAAY,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;QACjC,8BAA8B,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,QAAQ,EAAE;QAC3E,kBAAkB,EAAE,CAAC,CAAC,MAAM,CAAC;YAC3B,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE;YAChB,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE;SACjB,CAAC;KACH,CAAC;CACH,CAAC,CAAA;AAGF,+DAA+D;AAC/D,0DAA0D;AAC1D,MAAM,UAAU,oBAAoB,CAAC,MAAwB;IAC3D,MAAM,cAAc,GAAG,IAAI,CAAC,MAAM,CAAC;QACjC,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,WAAW,EAAE,CAAC,CAAC,CAAC,YAAY,CAAC,KAAK,EAAC,OAAO,EAAC,EAAE;YAC7F,OAAO,QAAQ,CAAC,gBAAgB,CAAC,OAAO,CAAC,KAAK,EAAE,OAAO,CAAC,MAAM,CAAC,CAAA;QACjE,CAAC,CAAC;QAEF,KAAK,EAAE,IAAI,CAAC,SAAS;aAClB,KAAK,CAAC,wBAAwB,CAAC;aAC/B,MAAM,CAAC,yBAAyB,CAAC;aACjC,QAAQ,CAAC,KAAK,EAAC,OAAO,EAAC,EAAE;YACxB,OAAO,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,EAAE,MAAM,CAAC,CAAA;QAC9C,CAAC,CAAC;QAEJ,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,EAAC,OAAO,EAAC,EAAE;YAC3G,OAAO,QAAQ,CAAC,SAAS,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;QAC1C,CAAC,CAAC;QAEF,uBAAuB,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,0BAA0B,CAAC,CAAC,QAAQ,CAAC,KAAK,EAAC,OAAO,EAAC,EAAE;YACjG,OAAO,QAAQ,CAAC,uBAAuB,CACrC,MAAM,EACN,OAAO,CAAC,MAAM,EACd,OAAO,CAAC,KAAK,EACb,OAAO,CAAC,KAAK,CAAC,YAAY,IAAI,KAAK,CACpC,CAAA;QACH,CAAC,CAAC;KACH,CAAC,CAAA;IAEF,OAAO,cAAc,CAAA;AACvB,CAAC"}
|
|
@@ -1,11 +1,13 @@
|
|
|
1
1
|
import assert from "assert";
|
|
2
2
|
import path from "path";
|
|
3
|
+
import { fileURLToPath } from "url";
|
|
3
4
|
import { describe, expect, it } from "vitest";
|
|
4
5
|
import { createDefaultConfig } from "../config.js";
|
|
5
6
|
import { Lazy } from "../utilities/Lazy.js";
|
|
6
7
|
import { buildSchemaForDirectoryTree, getDirectoryTree } from "./index.js";
|
|
8
|
+
const thisdir = path.dirname(fileURLToPath(import.meta.url));
|
|
7
9
|
describe("dirtree", () => {
|
|
8
|
-
const output = new Lazy(() => getDirectoryTree(path.join(
|
|
10
|
+
const output = new Lazy(() => getDirectoryTree(path.join(thisdir, "..", "..", "..", "..", "integration-tests", "test-environment")));
|
|
9
11
|
it("can get a list of all the files", () => {
|
|
10
12
|
const result = output.get().allFiles;
|
|
11
13
|
assert(result);
|
|
@@ -308,7 +310,7 @@ describe("dirtree", () => {
|
|
|
308
310
|
// configuration. These should be available for them in a type-safe manner so
|
|
309
311
|
// that they have the least possible friction when coding.
|
|
310
312
|
//
|
|
311
|
-
const smallDirectory = path.resolve(
|
|
313
|
+
const smallDirectory = path.resolve(thisdir, "../../../../integration-tests/test-environment/other-subdirectory/");
|
|
312
314
|
it("when there is a single name", async () => {
|
|
313
315
|
const config = createDefaultConfig("/my/root/path", {});
|
|
314
316
|
assert(config.integrations.neovim.NVIM_APPNAMEs.length === 1);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.test.js","sourceRoot":"","sources":["../../../../src/server/dirtree/index.test.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,QAAQ,CAAA;AAC3B,OAAO,IAAI,MAAM,MAAM,CAAA;
|
|
1
|
+
{"version":3,"file":"index.test.js","sourceRoot":"","sources":["../../../../src/server/dirtree/index.test.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,QAAQ,CAAA;AAC3B,OAAO,IAAI,MAAM,MAAM,CAAA;AACvB,OAAO,EAAE,aAAa,EAAE,MAAM,KAAK,CAAA;AAEnC,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAA;AAE7C,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAA;AAElD,OAAO,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAA;AAC3C,OAAO,EAAE,2BAA2B,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAA;AAE1E,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAA;AAE5D,QAAQ,CAAC,SAAS,EAAE,GAAG,EAAE;IACvB,MAAM,MAAM,GAAG,IAAI,IAAI,CAAC,GAAG,EAAE,CAC3B,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,mBAAmB,EAAE,kBAAkB,CAAC,CAAC,CACtG,CAAA;IAED,EAAE,CAAC,iCAAiC,EAAE,GAAG,EAAE;QACzC,MAAM,MAAM,GAAG,MAAM,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAA;QAEpC,MAAM,CAAC,MAAM,CAAC,CAAA;QACd,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,CAAA;QACxC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAA;QACjB,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,UAAU,EAAE,CAAA;IAC7C,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,wDAAwD,EAAE,KAAK,IAAI,EAAE;QACtE,MAAM,MAAM,GAAqB;YAC/B,GAAG,mBAAmB,CAAC,eAAe,EAAE,EAAE,CAAC;YAC3C,YAAY,EAAE;gBACZ,MAAM,EAAE;oBACN,aAAa,EAAE,CAAC,MAAgD,EAAE,UAAU,CAAC;iBAC9E;aACF;SACF,CAAA;QACD,MAAM,MAAM,GAAG,MAAM,2BAA2B,CAAC,MAAM,CAAC,GAAG,EAAE,EAAE,iBAAiB,EAAE,MAAM,CAAC,CAAA;QAEzF,MAAM,CAAC,MAAM,CAAC,CAAC,qBAAqB,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KAoPpC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,2DAA2D,EAAE,KAAK,IAAI,EAAE;QACzE,MAAM,MAAM,GAAqB,mBAAmB,CAAC,eAAe,EAAE,EAAE,CAAC,CAAA;QACzE,MAAM,IAAI,GAAG,gBAAgB,CAAC,aAAa,CAAC,CAAA;QAC5C,MAAM,MAAM,GAAG,MAAM,2BAA2B,CAAC,IAAI,EAAE,iBAAiB,EAAE,MAAM,CAAC,CAAA;QACjF,MAAM,CAAC,MAAM,CAAC,CAAC,qBAAqB,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;KA4BpC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;IAEF,QAAQ,CAAC,4CAA4C,EAAE,GAAG,EAAE;QAC1D,mEAAmE;QACnE,6EAA6E;QAC7E,0DAA0D;QAC1D,EAAE;QACF,MAAM,cAAc,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,oEAAoE,CAAC,CAAA;QAElH,EAAE,CAAC,6BAA6B,EAAE,KAAK,IAAI,EAAE;YAC3C,MAAM,MAAM,GAAqB,mBAAmB,CAAC,eAAe,EAAE,EAAE,CAAC,CAAA;YACzE,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,MAAM,CAAC,aAAa,CAAC,MAAM,KAAK,CAAC,CAAC,CAAA;YAC7D,MAAM,QAAQ,GAAG,gBAAgB,CAAC,cAAc,CAAC,CAAA;YACjD,MAAM,MAAM,GAAG,MAAM,2BAA2B,CAAC,QAAQ,EAAE,iBAAiB,EAAE,MAAM,CAAC,CAAA;YAErF,MAAM,CAAC,MAAM,CAAC,CAAC,qBAAqB,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAoCpC,CAAC,CAAA;YACF,6DAA6D;QAC/D,CAAC,CAAC,CAAA;QAEF,EAAE,CAAC,+BAA+B,EAAE,KAAK,IAAI,EAAE;YAC7C,MAAM,MAAM,GAAqB;gBAC/B,GAAG,mBAAmB,CAAC,eAAe,EAAE,EAAE,CAAC;gBAC3C,YAAY,EAAE;oBACZ,MAAM,EAAE;wBACN,aAAa,EAAE,CAAC,MAAgD,EAAE,UAAU,CAAC;qBAC9E;iBACF;aACF,CAAA;YACD,MAAM,QAAQ,GAAG,gBAAgB,CAAC,cAAc,CAAC,CAAA;YACjD,MAAM,MAAM,GAAG,MAAM,2BAA2B,CAAC,QAAQ,EAAE,iBAAiB,EAAE,MAAM,CAAC,CAAA;YAErF,MAAM,CAAC,MAAM,CAAC,CAAC,qBAAqB,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAoCpC,CAAC,CAAA;QACJ,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA"}
|
|
@@ -1,52 +1,60 @@
|
|
|
1
1
|
import { formatCode } from "../utilities/format.js";
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
return `z.array(${options[0]})`;
|
|
27
|
-
}
|
|
28
|
-
else if (options.length > 1) {
|
|
29
|
-
// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
|
|
30
|
-
return `z.array(z.union([${options}]))`;
|
|
2
|
+
const parse = (o, seen) => {
|
|
3
|
+
switch (typeof o) {
|
|
4
|
+
case "string":
|
|
5
|
+
return `z.literal("${o.replaceAll('"', `\\"`)}")`;
|
|
6
|
+
case "number":
|
|
7
|
+
return "z.number()";
|
|
8
|
+
case "bigint":
|
|
9
|
+
return "z.number().int()";
|
|
10
|
+
case "boolean":
|
|
11
|
+
return "z.boolean()";
|
|
12
|
+
case "object":
|
|
13
|
+
if (o === null) {
|
|
14
|
+
return "z.null()";
|
|
15
|
+
}
|
|
16
|
+
if (seen.find(_obj => Object.is(_obj, o))) {
|
|
17
|
+
throw new Error("Circular objects are not supported");
|
|
18
|
+
}
|
|
19
|
+
seen.push(o);
|
|
20
|
+
if (Array.isArray(o)) {
|
|
21
|
+
const options = o
|
|
22
|
+
.map(obj => parse(obj, seen))
|
|
23
|
+
.reduce((acc, curr) => {
|
|
24
|
+
if (acc.includes(curr)) {
|
|
25
|
+
return acc;
|
|
31
26
|
}
|
|
32
27
|
else {
|
|
33
|
-
|
|
28
|
+
acc.push(curr);
|
|
29
|
+
return acc;
|
|
34
30
|
}
|
|
31
|
+
}, []);
|
|
32
|
+
if (options.length === 1) {
|
|
33
|
+
return `z.array(${options[0]})`;
|
|
35
34
|
}
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
return
|
|
48
|
-
|
|
49
|
-
|
|
35
|
+
else if (options.length > 1) {
|
|
36
|
+
// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
|
|
37
|
+
return `z.array(z.union([${options}]))`;
|
|
38
|
+
}
|
|
39
|
+
else {
|
|
40
|
+
return `z.array(z.unknown())`;
|
|
41
|
+
}
|
|
42
|
+
}
|
|
43
|
+
// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
|
|
44
|
+
return `z.object({${Object.entries(o).map(([k, v]) => {
|
|
45
|
+
const key = k.replaceAll("'", "\\'");
|
|
46
|
+
return `'${key}':${parse(v, seen)}`;
|
|
47
|
+
})}})`;
|
|
48
|
+
case "undefined":
|
|
49
|
+
return "z.undefined()";
|
|
50
|
+
case "function":
|
|
51
|
+
return "z.function()";
|
|
52
|
+
case "symbol":
|
|
53
|
+
default:
|
|
54
|
+
return "z.unknown()";
|
|
55
|
+
}
|
|
56
|
+
};
|
|
57
|
+
export async function jsonToZod(config, object, name = "schema") {
|
|
50
58
|
return formatCode(config, `import * as z from "zod"\n\nexport const ${name}=${parse(object, [])}`);
|
|
51
59
|
}
|
|
52
60
|
//# sourceMappingURL=json-to-zod.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"json-to-zod.js","sourceRoot":"","sources":["../../../../src/server/dirtree/json-to-zod.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAA;AAEnD,MAAM,
|
|
1
|
+
{"version":3,"file":"json-to-zod.js","sourceRoot":"","sources":["../../../../src/server/dirtree/json-to-zod.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAA;AAEnD,MAAM,KAAK,GAAG,CAAC,CAAU,EAAE,IAAc,EAAU,EAAE;IACnD,QAAQ,OAAO,CAAC,EAAE,CAAC;QACjB,KAAK,QAAQ;YACX,OAAO,cAAc,CAAC,CAAC,UAAU,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,CAAA;QACnD,KAAK,QAAQ;YACX,OAAO,YAAY,CAAA;QACrB,KAAK,QAAQ;YACX,OAAO,kBAAkB,CAAA;QAC3B,KAAK,SAAS;YACZ,OAAO,aAAa,CAAA;QACtB,KAAK,QAAQ;YACX,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC;gBACf,OAAO,UAAU,CAAA;YACnB,CAAC;YACD,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC1C,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAA;YACvD,CAAC;YACD,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;YACZ,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;gBACrB,MAAM,OAAO,GAAG,CAAC;qBACd,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;qBAC5B,MAAM,CAAC,CAAC,GAAa,EAAE,IAAY,EAAE,EAAE;oBACtC,IAAI,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;wBACvB,OAAO,GAAG,CAAA;oBACZ,CAAC;yBAAM,CAAC;wBACN,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;wBACd,OAAO,GAAG,CAAA;oBACZ,CAAC;gBACH,CAAC,EAAE,EAAE,CAAC,CAAA;gBACR,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;oBACzB,OAAO,WAAW,OAAO,CAAC,CAAC,CAAC,GAAG,CAAA;gBACjC,CAAC;qBAAM,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBAC9B,4EAA4E;oBAC5E,OAAO,oBAAoB,OAAO,KAAK,CAAA;gBACzC,CAAC;qBAAM,CAAC;oBACN,OAAO,sBAAsB,CAAA;gBAC/B,CAAC;YACH,CAAC;YACD,4EAA4E;YAC5E,OAAO,aAAa,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE;gBACnD,MAAM,GAAG,GAAG,CAAC,CAAC,UAAU,CAAC,GAAG,EAAE,KAAK,CAAC,CAAA;gBACpC,OAAO,IAAI,GAAG,KAAK,KAAK,CAAC,CAAC,EAAE,IAAI,CAAC,EAAE,CAAA;YACrC,CAAC,CAAC,IAAI,CAAA;QACR,KAAK,WAAW;YACd,OAAO,eAAe,CAAA;QACxB,KAAK,UAAU;YACb,OAAO,cAAc,CAAA;QACvB,KAAK,QAAQ,CAAC;QACd;YACE,OAAO,aAAa,CAAA;IACxB,CAAC;AACH,CAAC,CAAA;AACD,MAAM,CAAC,KAAK,UAAU,SAAS,CAAC,MAAuB,EAAE,MAAe,EAAE,OAAe,QAAQ;IAC/F,OAAO,UAAU,CAAC,MAAM,EAAE,4CAA4C,IAAI,IAAI,KAAK,CAAC,MAAM,EAAE,EAAE,CAAC,EAAE,CAAC,CAAA;AACpG,CAAC"}
|
|
@@ -14,6 +14,7 @@ describe("when the schema has not changed", () => {
|
|
|
14
14
|
it("does not write the file", async () => {
|
|
15
15
|
mock.buildTestDirectorySchema.mockResolvedValue("schema");
|
|
16
16
|
mock.readFileSync.mockImplementation(() => "schema");
|
|
17
|
+
// oxlint-disable-next-line typescript/no-unsafe-type-assertion
|
|
17
18
|
const result = await updateTestdirectorySchemaFile({
|
|
18
19
|
directories: {
|
|
19
20
|
testEnvironmentPath: "path",
|
|
@@ -27,6 +28,7 @@ describe("when the schema has changed", () => {
|
|
|
27
28
|
it("writes the file", async () => {
|
|
28
29
|
mock.buildTestDirectorySchema.mockResolvedValue("new schema");
|
|
29
30
|
mock.readFileSync.mockImplementation(() => "old schema");
|
|
31
|
+
// oxlint-disable-next-line typescript/no-unsafe-type-assertion
|
|
30
32
|
const result = await updateTestdirectorySchemaFile({
|
|
31
33
|
directories: {
|
|
32
34
|
testEnvironmentPath: "path",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"updateTestdirectorySchemaFile.test.js","sourceRoot":"","sources":["../../../src/server/updateTestdirectorySchemaFile.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,IAAI,CAAA;AAGhD,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAA;AAEjD,OAAO,EAAE,wBAAwB,EAAE,MAAM,oBAAoB,CAAA;AAE7D,OAAO,EAAE,6BAA6B,EAAE,MAAM,oCAAoC,CAAA;AAElF,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;AACb,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;AACpB,EAAE,CAAC,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,kBAAkB,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAA;AAEpD,MAAM,IAAI,GAAG;IACX,YAAY,EAAE,EAAE,CAAC,MAAM,CAAC,YAAY,CAAC;IACrC,aAAa,EAAE,EAAE,CAAC,MAAM,CAAC,aAAa,CAAC;IACvC,wBAAwB,EAAE,EAAE,CAAC,MAAM,CAAC,wBAAwB,CAAC;CAC9D,CAAA;AAED,QAAQ,CAAC,iCAAiC,EAAE,GAAG,EAAE;IAC/C,EAAE,CAAC,yBAAyB,EAAE,KAAK,IAAI,EAAE;QACvC,IAAI,CAAC,wBAAwB,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAA;QACzD,IAAI,CAAC,YAAY,CAAC,kBAAkB,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,CAAA;QAEpD,MAAM,MAAM,GAAG,MAAM,6BAA6B,CAAC;YACjD,WAAW,EAAE;gBACX,mBAAmB,EAAE,MAAM;gBAC3B,cAAc,EAAE,MAAM;aACvB;SAC0D,CAAC,CAAA;QAE9D,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,aAA2D,CAAC,CAAA;IAClF,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA;AAEF,QAAQ,CAAC,6BAA6B,EAAE,GAAG,EAAE;IAC3C,EAAE,CAAC,iBAAiB,EAAE,KAAK,IAAI,EAAE;QAC/B,IAAI,CAAC,wBAAwB,CAAC,iBAAiB,CAAC,YAAY,CAAC,CAAA;QAC7D,IAAI,CAAC,YAAY,CAAC,kBAAkB,CAAC,GAAG,EAAE,CAAC,YAAY,CAAC,CAAA;QAExD,MAAM,MAAM,GAAG,MAAM,6BAA6B,CAAC;YACjD,WAAW,EAAE;gBACX,mBAAmB,EAAE,MAAM;gBAC3B,cAAc,EAAE,MAAM;aACvB;SAC0D,CAAC,CAAA;QAE9D,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,SAAuD,CAAC,CAAA;QAC5E,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,oBAAoB,CAAC,MAAM,EAAE,YAAY,CAAC,CAAA;IACvE,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA"}
|
|
1
|
+
{"version":3,"file":"updateTestdirectorySchemaFile.test.js","sourceRoot":"","sources":["../../../src/server/updateTestdirectorySchemaFile.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,IAAI,CAAA;AAGhD,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAA;AAEjD,OAAO,EAAE,wBAAwB,EAAE,MAAM,oBAAoB,CAAA;AAE7D,OAAO,EAAE,6BAA6B,EAAE,MAAM,oCAAoC,CAAA;AAElF,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;AACb,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;AACpB,EAAE,CAAC,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,kBAAkB,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAA;AAEpD,MAAM,IAAI,GAAG;IACX,YAAY,EAAE,EAAE,CAAC,MAAM,CAAC,YAAY,CAAC;IACrC,aAAa,EAAE,EAAE,CAAC,MAAM,CAAC,aAAa,CAAC;IACvC,wBAAwB,EAAE,EAAE,CAAC,MAAM,CAAC,wBAAwB,CAAC;CAC9D,CAAA;AAED,QAAQ,CAAC,iCAAiC,EAAE,GAAG,EAAE;IAC/C,EAAE,CAAC,yBAAyB,EAAE,KAAK,IAAI,EAAE;QACvC,IAAI,CAAC,wBAAwB,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAA;QACzD,IAAI,CAAC,YAAY,CAAC,kBAAkB,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,CAAA;QAEpD,+DAA+D;QAC/D,MAAM,MAAM,GAAG,MAAM,6BAA6B,CAAC;YACjD,WAAW,EAAE;gBACX,mBAAmB,EAAE,MAAM;gBAC3B,cAAc,EAAE,MAAM;aACvB;SAC0D,CAAC,CAAA;QAE9D,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,aAA2D,CAAC,CAAA;IAClF,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA;AAEF,QAAQ,CAAC,6BAA6B,EAAE,GAAG,EAAE;IAC3C,EAAE,CAAC,iBAAiB,EAAE,KAAK,IAAI,EAAE;QAC/B,IAAI,CAAC,wBAAwB,CAAC,iBAAiB,CAAC,YAAY,CAAC,CAAA;QAC7D,IAAI,CAAC,YAAY,CAAC,kBAAkB,CAAC,GAAG,EAAE,CAAC,YAAY,CAAC,CAAA;QAExD,+DAA+D;QAC/D,MAAM,MAAM,GAAG,MAAM,6BAA6B,CAAC;YACjD,WAAW,EAAE;gBACX,mBAAmB,EAAE,MAAM;gBAC3B,cAAc,EAAE,MAAM;aACvB;SAC0D,CAAC,CAAA;QAE9D,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,SAAuD,CAAC,CAAA;QAC5E,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,oBAAoB,CAAC,MAAM,EAAE,YAAY,CAAC,CAAA;IACvE,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA"}
|
|
@@ -67,7 +67,7 @@ describe("DisposableSingleApplication", () => {
|
|
|
67
67
|
const app = new TestDisposableSingleApplication();
|
|
68
68
|
expect(app.getApplication()).toBeUndefined();
|
|
69
69
|
expect(app.processId()).toBeUndefined();
|
|
70
|
-
expect(
|
|
70
|
+
await expect(app[Symbol.asyncDispose]()).resolves.not.toThrow();
|
|
71
71
|
});
|
|
72
72
|
});
|
|
73
73
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DisposableSingleApplication.test.js","sourceRoot":"","sources":["../../../../src/server/utilities/DisposableSingleApplication.test.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"DisposableSingleApplication.test.js","sourceRoot":"","sources":["../../../../src/server/utilities/DisposableSingleApplication.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAA;AAGjD,OAAO,EAAE,2BAA2B,EAAE,MAAM,kCAAkC,CAAA;AAG9E,EAAE,CAAC,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,kBAAkB,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAA;AAEpD,MAAM,+BAAgC,SAAQ,2BAA2B;IAChE,cAAc;QACnB,OAAO,IAAI,CAAC,WAAW,CAAA;IACzB,CAAC;CACF;AAED,MAAM,OAAO,GAAG;IACd,SAAS,EAAE,GAAG;IACd,KAAK,EAAE,EAAE,CAAC,EAAE,EAAE;IACd,WAAW,EAAE,EAAE,CAAC,EAAE,EAAE;IACpB,SAAS,EAAE,OAAO,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,CAAC;CACb,CAAA;AAEhC,QAAQ,CAAC,6BAA6B,EAAE,GAAG,EAAE;IAC3C,EAAE,CAAC,iCAAiC,EAAE,GAAG,EAAE;QACzC,MAAM,GAAG,GAAG,IAAI,+BAA+B,EAAE,CAAA;QACjD,MAAM,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC,CAAC,aAAa,EAAE,CAAA;QACvC,MAAM,CAAC,GAAG,CAAC,cAAc,EAAE,CAAC,CAAC,aAAa,EAAE,CAAA;IAC9C,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,0BAA0B,EAAE,KAAK,IAAI,EAAE;QACxC,MAAM,GAAG,GAAG,IAAI,+BAA+B,EAAE,CAAA;QACjD,MAAM,GAAG,CAAC,uBAAuB,CAAC,KAAK,IAAI,EAAE,CAAC,OAAO,CAAC,CAAA;QACtD,MAAM,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;QACjC,MAAM,CAAC,GAAG,CAAC,cAAc,EAAE,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;IAC5C,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,8BAA8B,EAAE,KAAK,IAAI,EAAE;QAC5C,MAAM,GAAG,GAAG,IAAI,+BAA+B,EAAE,CAAA;QACjD,MAAM,GAAG,CAAC,uBAAuB,CAAC,KAAK,IAAI,EAAE,CAAC,OAAO,CAAC,CAAA;QACtD,MAAM,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;QACxB,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAAA;IACrD,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,kDAAkD,EAAE,KAAK,IAAI,EAAE;QAChE,oEAAoE;QACpE,qCAAqC;QACrC,MAAM,GAAG,GAAG,IAAI,+BAA+B,EAAE,CAAA;QACjD,MAAM,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,kCAAkC,CACzE,gHAAgH,CACjH,CAAA;IACH,CAAC,CAAC,CAAA;IAEF,QAAQ,CAAC,sDAAsD,EAAE,GAAG,EAAE;QACpE,EAAE,CAAC,uBAAuB,EAAE,KAAK,IAAI,EAAE;YACrC,MAAM,GAAG,GAAG,IAAI,+BAA+B,EAAE,CAAA;YACjD,MAAM,GAAG,CAAC,uBAAuB,CAAC,KAAK,IAAI,EAAE,CAAC,OAAO,CAAC,CAAA;YACtD,OAAO,CAAC,SAAS,GAAG,OAAO,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,CAAC,CAAA;YACpD,MAAM,MAAM,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC,CAAC,QAAQ,CAAC,aAAa,CAAC;gBACnD,QAAQ,EAAE,CAAC;aACO,CAAC,CAAA;QACvB,CAAC,CAAC,CAAA;QAEF,EAAE,CAAC,+DAA+D,EAAE,KAAK,IAAI,EAAE;YAC7E,MAAM,GAAG,GAAG,IAAI,+BAA+B,EAAE,CAAA;YACjD,MAAM,GAAG,CAAC,uBAAuB,CAAC,KAAK,IAAI,EAAE,CAAC,OAAO,CAAC,CAAA;YACtD,OAAO,CAAC,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,YAAY,CAAC,CAAC,CAAA;YAC3D,MAAM,MAAM,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,KAAK,CAAC,YAAY,CAAC,CAAC,CAAA;QACxE,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;IAEF,QAAQ,CAAC,WAAW,EAAE,GAAG,EAAE;QACzB,EAAE,CAAC,wCAAwC,EAAE,KAAK,IAAI,EAAE;YACtD,sEAAsE;YACtE,yEAAyE;YACzE,cAAc;YACd,MAAM,GAAG,GAAG,IAAI,+BAA+B,EAAE,CAAA;YAEjD,MAAM,GAAG,CAAC,uBAAuB,CAAC,KAAK,IAAI,EAAE,CAAC,OAAO,CAAC,CAAA;YACtD,MAAM,CAAC,GAAG,CAAC,cAAc,EAAE,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;YAE1C,MAAM,GAAG,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE,CAAA;YAChC,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,oBAAoB,EAAE,CAAA;QACpD,CAAC,CAAC,CAAA;QAEF,EAAE,CAAC,oDAAoD,EAAE,KAAK,IAAI,EAAE;YAClE,MAAM,GAAG,GAAG,IAAI,+BAA+B,EAAE,CAAA;YACjD,MAAM,CAAC,GAAG,CAAC,cAAc,EAAE,CAAC,CAAC,aAAa,EAAE,CAAA;YAC5C,MAAM,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC,CAAC,aAAa,EAAE,CAAA;YAEvC,MAAM,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,EAAE,CAAA;QACjE,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA"}
|
|
@@ -4,7 +4,7 @@ import { createRequire } from "node:module";
|
|
|
4
4
|
import path from "node:path";
|
|
5
5
|
import { fileURLToPath } from "node:url";
|
|
6
6
|
import * as z from "zod";
|
|
7
|
-
const
|
|
7
|
+
const thisfile = fileURLToPath(import.meta.url);
|
|
8
8
|
const require = createRequire(import.meta.url);
|
|
9
9
|
export const isTypeScriptPath = (filePath) => filePath.endsWith(".ts");
|
|
10
10
|
export const formatCode = async (config, code,
|
|
@@ -13,7 +13,7 @@ export const formatCode = async (config, code,
|
|
|
13
13
|
fileName = "generated.ts") => {
|
|
14
14
|
if (config.use === "prettier") {
|
|
15
15
|
const { format, resolveConfig } = await import("prettier");
|
|
16
|
-
const prettierConfig = await resolveConfig(
|
|
16
|
+
const prettierConfig = await resolveConfig(thisfile);
|
|
17
17
|
return format(code, {
|
|
18
18
|
...prettierConfig,
|
|
19
19
|
parser: "typescript",
|
|
@@ -29,7 +29,7 @@ const resolveOxfmtCliPath = () => {
|
|
|
29
29
|
const packageJson = oxfmtPackageJsonSchema.parse(contents);
|
|
30
30
|
return path.join(path.dirname(packageJsonPath), packageJson.bin.oxfmt);
|
|
31
31
|
};
|
|
32
|
-
const formatWithOxfmt = (code, fileName) => {
|
|
32
|
+
const formatWithOxfmt = async (code, fileName) => {
|
|
33
33
|
const oxfmtCliPath = resolveOxfmtCliPath();
|
|
34
34
|
return new Promise((resolve, reject) => {
|
|
35
35
|
// oxfmt discovers config by walking up from the --stdin-filepath directory,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"format.js","sourceRoot":"","sources":["../../../../src/server/utilities/format.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAA;AAC1C,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAA;AACtC,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAC3C,OAAO,IAAI,MAAM,WAAW,CAAA;AAC5B,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAA;AAExC,OAAO,KAAK,CAAC,MAAM,KAAK,CAAA;AAIxB,MAAM,
|
|
1
|
+
{"version":3,"file":"format.js","sourceRoot":"","sources":["../../../../src/server/utilities/format.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAA;AAC1C,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAA;AACtC,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAC3C,OAAO,IAAI,MAAM,WAAW,CAAA;AAC5B,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAA;AAExC,OAAO,KAAK,CAAC,MAAM,KAAK,CAAA;AAIxB,MAAM,QAAQ,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;AAC/C,MAAM,OAAO,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;AAC9C,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,QAAgB,EAA8B,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;AAE1G,MAAM,CAAC,MAAM,UAAU,GAAG,KAAK,EAC7B,MAAuB,EACvB,IAAY;AACZ,6EAA6E;AAC7E,+DAA+D;AAC/D,WAA2B,cAAc,EACxB,EAAE;IACnB,IAAI,MAAM,CAAC,GAAG,KAAK,UAAU,EAAE,CAAC;QAC9B,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,GAAG,MAAM,MAAM,CAAC,UAAU,CAAC,CAAA;QAC1D,MAAM,cAAc,GAAG,MAAM,aAAa,CAAC,QAAQ,CAAC,CAAA;QAEpD,OAAO,MAAM,CAAC,IAAI,EAAE;YAClB,GAAG,cAAc;YACjB,MAAM,EAAE,YAAY;SACrB,CAAC,CAAA;IACJ,CAAC;IAED,MAAM,CAAC,GAAqB,CAAA;IAC5B,OAAO,eAAe,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAA;AACxC,CAAC,CAAA;AACD,MAAM,sBAAsB,GAAG,CAAC,CAAC,MAAM,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,EAAE,CAAC,CAAA;AAEjF,MAAM,mBAAmB,GAAG,GAAW,EAAE;IACvC,MAAM,eAAe,GAAG,OAAO,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAA;IAC7D,MAAM,QAAQ,GAAY,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC,CAAA;IAC3E,MAAM,WAAW,GAAG,sBAAsB,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAA;IAC1D,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,EAAE,WAAW,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;AACxE,CAAC,CAAA;AAED,MAAM,eAAe,GAAG,KAAK,EAAE,IAAY,EAAE,QAAgB,EAAmB,EAAE;IAChF,MAAM,YAAY,GAAG,mBAAmB,EAAE,CAAA;IAE1C,OAAO,IAAI,OAAO,CAAS,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QAC7C,4EAA4E;QAC5E,0EAA0E;QAC1E,MAAM,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,YAAY,EAAE,oBAAoB,QAAQ,EAAE,CAAC,CAAC,CAAA;QAErF,IAAI,MAAM,GAAG,EAAE,CAAA;QACf,IAAI,MAAM,GAAG,EAAE,CAAA;QACf,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC,MAAM,IAAI,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;QAC3D,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC,MAAM,IAAI,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;QAC3D,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC,CAAA;QACzB,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,QAAQ,CAAC,EAAE;YAC3B,IAAI,QAAQ,KAAK,CAAC,EAAE,CAAC;gBACnB,OAAO,CAAC,MAAM,CAAC,CAAA;YACjB,CAAC;iBAAM,CAAC;gBACN,MAAM,CAAC,IAAI,KAAK,CAAC,+CAA+C,MAAM,CAAC,QAAQ,CAAC,MAAM,MAAM,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAA;YACzG,CAAC;QACH,CAAC,CAAC,CAAA;QAEF,mEAAmE;QACnE,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC,CAAA;QAC/B,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;IACvB,CAAC,CAAC,CAAA;AACJ,CAAC,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../src/server/utilities/generator.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,KAAK,SAAS,CAAC,CAAC,mCAAmC,CACxD,OAAqB,EACrB,SAAiB;IAEjB,OAAO,IAAI,EAAE,CAAC;QACZ,MAAM,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE;YAChC,OAAO,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,CAAA;QAClC,CAAC,CAAC,CAAA;IACJ,CAAC;AACH,CAAC"}
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../src/server/utilities/generator.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,KAAK,SAAS,CAAC,CAAC,mCAAmC,CACxD,OAAqB,EACrB,SAAiB;IAEjB,OAAO,IAAI,EAAE,CAAC;QACZ,2EAA2E;QAC3E,MAAM,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE;YAChC,OAAO,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,CAAA;QAClC,CAAC,CAAC,CAAA;IACJ,CAAC;AACH,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"timeout.js","sourceRoot":"","sources":["../../../../src/server/utilities/timeout.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,OAAO,CAAC,EAAU;
|
|
1
|
+
{"version":3,"file":"timeout.js","sourceRoot":"","sources":["../../../../src/server/utilities/timeout.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,KAAK,UAAU,OAAO,CAAC,EAAU;IACtC,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAA;AACxD,CAAC"}
|