@tui-sandbox/library 9.2.1 → 9.5.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/CHANGELOG.md +21 -0
- package/dist/browser/assets/{index-BVkLGLTD.js → index-06LPWRXA.js} +6 -6
- package/dist/browser/index.html +1 -1
- package/dist/src/browser/neovim-client.d.ts +2 -1
- package/dist/src/browser/neovim-client.js.map +1 -1
- package/dist/src/client/neovim-terminal-client.d.ts +2 -1
- package/dist/src/client/neovim-terminal-client.js.map +1 -1
- package/dist/src/client/terminal-terminal-client.d.ts +1 -1
- package/dist/src/client/terminal-terminal-client.js.map +1 -1
- package/dist/src/server/blockingCommandInputSchema.d.ts +70 -0
- package/dist/src/server/blockingCommandInputSchema.js +20 -0
- package/dist/src/server/blockingCommandInputSchema.js.map +1 -0
- package/dist/src/server/blockingCommandInputSchema.test.d.ts +1 -0
- package/dist/src/server/blockingCommandInputSchema.test.js +22 -0
- package/dist/src/server/blockingCommandInputSchema.test.js.map +1 -0
- package/dist/src/server/cypress-support/contents.js +12 -10
- package/dist/src/server/cypress-support/contents.js.map +1 -1
- package/dist/src/server/neovim/index.d.ts +2 -1
- package/dist/src/server/neovim/index.js +1 -1
- package/dist/src/server/neovim/index.js.map +1 -1
- package/dist/src/server/server.d.ts +15 -53
- package/dist/src/server/server.js +1 -11
- package/dist/src/server/server.js.map +1 -1
- package/dist/src/server/terminal/index.d.ts +1 -1
- package/dist/src/server/terminal/index.js +1 -1
- package/dist/src/server/terminal/index.js.map +1 -1
- package/dist/src/server/terminal/runBlockingShellCommand.d.ts +10 -3
- package/dist/src/server/terminal/runBlockingShellCommand.js +22 -11
- package/dist/src/server/terminal/runBlockingShellCommand.js.map +1 -1
- package/dist/src/server/terminal/runBlockingShellCommand.test.d.ts +1 -0
- package/dist/src/server/terminal/runBlockingShellCommand.test.js +35 -0
- package/dist/src/server/terminal/runBlockingShellCommand.test.js.map +1 -0
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +8 -8
- package/src/browser/neovim-client.ts +2 -1
- package/src/client/neovim-terminal-client.ts +2 -6
- package/src/client/terminal-terminal-client.ts +2 -1
- package/src/server/blockingCommandInputSchema.test.ts +23 -0
- package/src/server/blockingCommandInputSchema.ts +28 -0
- package/src/server/cypress-support/contents.ts +12 -10
- package/src/server/neovim/index.ts +3 -2
- package/src/server/server.ts +1 -16
- package/src/server/terminal/index.ts +2 -2
- package/src/server/terminal/runBlockingShellCommand.test.ts +40 -0
- package/src/server/terminal/runBlockingShellCommand.ts +31 -13
package/dist/browser/index.html
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
<head>
|
|
4
4
|
<meta charset="UTF-8" />
|
|
5
5
|
<title>tui-sandbox integration tests</title>
|
|
6
|
-
<script type="module" crossorigin src="/assets/index-
|
|
6
|
+
<script type="module" crossorigin src="/assets/index-06LPWRXA.js"></script>
|
|
7
7
|
<link rel="stylesheet" crossorigin href="/assets/index-D6fBrqAi.css">
|
|
8
8
|
</head>
|
|
9
9
|
<body>
|
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import type { BlockingCommandClientInput
|
|
1
|
+
import type { BlockingCommandClientInput } from "../server/blockingCommandInputSchema.js";
|
|
2
|
+
import type { ExCommandClientInput, LuaCodeClientInput } from "../server/server.js";
|
|
2
3
|
import type { StartTerminalGenericArguments } from "../server/terminal/TerminalTestApplication.js";
|
|
3
4
|
import type { BlockingShellCommandOutput, RunExCommandOutput, RunLuaCodeOutput, StartNeovimGenericArguments, TestDirectory } from "../server/types.js";
|
|
4
5
|
export type GenericNeovimBrowserApi = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"neovim-client.js","sourceRoot":"","sources":["../../../src/browser/neovim-client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,IAAI,oBAAoB,EAAE,MAAM,oBAAoB,CAAA;AAC3E,OAAO,EAAE,sBAAsB,EAAE,MAAM,uCAAuC,CAAA;
|
|
1
|
+
{"version":3,"file":"neovim-client.js","sourceRoot":"","sources":["../../../src/browser/neovim-client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,IAAI,oBAAoB,EAAE,MAAM,oBAAoB,CAAA;AAC3E,OAAO,EAAE,sBAAsB,EAAE,MAAM,uCAAuC,CAAA;AAW9E,OAAO,EAAE,IAAI,EAAE,MAAM,6BAA6B,CAAA;AAElD,MAAM,GAAG,GAAG,QAAQ,CAAC,aAAa,CAAc,MAAM,CAAC,CAAA;AACvD,IAAI,CAAC,GAAG,EAAE,CAAC;IACT,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAA;AACzC,CAAC;AAED,qEAAqE;AACrE,MAAM,YAAY,GAAG,IAAI,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,oBAAoB,CAAC,GAAG,CAAC,CAAC,CAAA;AAClE,MAAM,cAAc,GAAG,IAAI,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,sBAAsB,CAAC,GAAG,CAAC,CAAC,CAAA;AAStE,+CAA+C;AAC/C,MAAM,CAAC,WAAW,GAAG,KAAK,WAAW,SAAuC;IAC1E,MAAM,MAAM,GAAG,YAAY,CAAC,GAAG,EAAE,CAAA;IACjC,MAAM,aAAa,GAAG,MAAM,MAAM,CAAC,WAAW,CAAC;QAC7C,8BAA8B,EAAE,SAAS,EAAE,8BAA8B;QACzE,QAAQ,EAAE,SAAS,EAAE,QAAQ,IAAI,kBAAkB;QACnD,0BAA0B,EAAE,SAAS,EAAE,0BAA0B,IAAI,EAAE;KACxE,CAAC,CAAA;IAEF,MAAM,gBAAgB,GAA4B;QAChD,uBAAuB,CAAC,KAAiC;YACvD,OAAO,MAAM,CAAC,uBAAuB,CAAC,KAAK,CAAC,CAAA;QAC9C,CAAC;QACD,UAAU,CAAC,KAAK;YACd,OAAO,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,CAAA;QACjC,CAAC;QACD,YAAY,CAAC,KAAK;YAChB,OAAO,MAAM,CAAC,YAAY,CAAC,KAAK,CAAC,CAAA;QACnC,CAAC;QACD,GAAG,EAAE,aAAa;KACnB,CAAA;IAED,OAAO,gBAAgB,CAAA;AACzB,CAAC,CAAA;AAcD,+CAA+C;AAC/C,MAAM,CAAC,wBAAwB,GAAG,KAAK,WACrC,IAAmC;IAEnC,MAAM,QAAQ,GAAG,cAAc,CAAC,GAAG,EAAE,CAAA;IACrC,MAAM,aAAa,GAAG,MAAM,QAAQ,CAAC,wBAAwB,CAAC,IAAI,CAAC,CAAA;IACnE,OAAO;QACL,GAAG,EAAE,aAAa;QAClB,uBAAuB,CAAC,KAAK;YAC3B,OAAO,QAAQ,CAAC,uBAAuB,CAAC,KAAK,CAAC,CAAA;QAChD,CAAC;KACF,CAAA;AACH,CAAC,CAAA"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import "@xterm/xterm/css/xterm.css";
|
|
2
|
-
import type { BlockingCommandClientInput
|
|
2
|
+
import type { BlockingCommandClientInput } from "../server/blockingCommandInputSchema.js";
|
|
3
|
+
import type { ExCommandClientInput, LuaCodeClientInput } from "../server/server.js";
|
|
3
4
|
import type { BlockingShellCommandOutput, RunExCommandOutput, RunLuaCodeOutput, StartNeovimGenericArguments, TestDirectory } from "../server/types.js";
|
|
4
5
|
import "./style.css";
|
|
5
6
|
/** Manages the terminal state in the browser as well as the (browser's)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"neovim-terminal-client.js","sourceRoot":"","sources":["../../../src/client/neovim-terminal-client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,aAAa,EAAE,SAAS,EAAE,6BAA6B,EAAE,MAAM,cAAc,CAAA;AAExG,OAAO,4BAA4B,CAAA;
|
|
1
|
+
{"version":3,"file":"neovim-terminal-client.js","sourceRoot":"","sources":["../../../src/client/neovim-terminal-client.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import "@xterm/xterm/css/xterm.css";
|
|
2
|
-
import type { BlockingCommandClientInput } from "../server/
|
|
2
|
+
import type { BlockingCommandClientInput } from "../server/blockingCommandInputSchema.js";
|
|
3
3
|
import type { StartTerminalGenericArguments } from "../server/terminal/TerminalTestApplication.js";
|
|
4
4
|
import type { BlockingShellCommandOutput, TestDirectory } from "../server/types.js";
|
|
5
5
|
import "./style.css";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"terminal-terminal-client.js","sourceRoot":"","sources":["../../../src/client/terminal-terminal-client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,aAAa,EAAE,SAAS,EAAE,6BAA6B,EAAE,MAAM,cAAc,CAAA;AAExG,OAAO,4BAA4B,CAAA;
|
|
1
|
+
{"version":3,"file":"terminal-terminal-client.js","sourceRoot":"","sources":["../../../src/client/terminal-terminal-client.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,70 @@
|
|
|
1
|
+
import "core-js/proposals/async-explicit-resource-management.js";
|
|
2
|
+
import type { Except } from "type-fest";
|
|
3
|
+
import { z } from "zod";
|
|
4
|
+
export declare const blockingCommandInputSchema: z.ZodEffects<z.ZodObject<{
|
|
5
|
+
command: z.ZodString;
|
|
6
|
+
shell: z.ZodOptional<z.ZodString>;
|
|
7
|
+
tabId: z.ZodObject<{
|
|
8
|
+
tabId: z.ZodString;
|
|
9
|
+
}, "strip", z.ZodTypeAny, {
|
|
10
|
+
tabId: string;
|
|
11
|
+
}, {
|
|
12
|
+
tabId: string;
|
|
13
|
+
}>;
|
|
14
|
+
allowFailure: z.ZodOptional<z.ZodBoolean>;
|
|
15
|
+
cwd: z.ZodOptional<z.ZodString>;
|
|
16
|
+
cwdRelative: z.ZodOptional<z.ZodString>;
|
|
17
|
+
envOverrides: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
|
|
18
|
+
uid: z.ZodOptional<z.ZodNumber>;
|
|
19
|
+
gid: z.ZodOptional<z.ZodNumber>;
|
|
20
|
+
}, "strip", z.ZodTypeAny, {
|
|
21
|
+
tabId: {
|
|
22
|
+
tabId: string;
|
|
23
|
+
};
|
|
24
|
+
command: string;
|
|
25
|
+
shell?: string | undefined;
|
|
26
|
+
allowFailure?: boolean | undefined;
|
|
27
|
+
cwd?: string | undefined;
|
|
28
|
+
cwdRelative?: string | undefined;
|
|
29
|
+
envOverrides?: Record<string, string> | undefined;
|
|
30
|
+
uid?: number | undefined;
|
|
31
|
+
gid?: number | undefined;
|
|
32
|
+
}, {
|
|
33
|
+
tabId: {
|
|
34
|
+
tabId: string;
|
|
35
|
+
};
|
|
36
|
+
command: string;
|
|
37
|
+
shell?: string | undefined;
|
|
38
|
+
allowFailure?: boolean | undefined;
|
|
39
|
+
cwd?: string | undefined;
|
|
40
|
+
cwdRelative?: string | undefined;
|
|
41
|
+
envOverrides?: Record<string, string> | undefined;
|
|
42
|
+
uid?: number | undefined;
|
|
43
|
+
gid?: number | undefined;
|
|
44
|
+
}>, {
|
|
45
|
+
tabId: {
|
|
46
|
+
tabId: string;
|
|
47
|
+
};
|
|
48
|
+
command: string;
|
|
49
|
+
shell?: string | undefined;
|
|
50
|
+
allowFailure?: boolean | undefined;
|
|
51
|
+
cwd?: string | undefined;
|
|
52
|
+
cwdRelative?: string | undefined;
|
|
53
|
+
envOverrides?: Record<string, string> | undefined;
|
|
54
|
+
uid?: number | undefined;
|
|
55
|
+
gid?: number | undefined;
|
|
56
|
+
}, {
|
|
57
|
+
tabId: {
|
|
58
|
+
tabId: string;
|
|
59
|
+
};
|
|
60
|
+
command: string;
|
|
61
|
+
shell?: string | undefined;
|
|
62
|
+
allowFailure?: boolean | undefined;
|
|
63
|
+
cwd?: string | undefined;
|
|
64
|
+
cwdRelative?: string | undefined;
|
|
65
|
+
envOverrides?: Record<string, string> | undefined;
|
|
66
|
+
uid?: number | undefined;
|
|
67
|
+
gid?: number | undefined;
|
|
68
|
+
}>;
|
|
69
|
+
export type BlockingCommandClientInput = Except<BlockingCommandInput, "tabId">;
|
|
70
|
+
export type BlockingCommandInput = z.infer<typeof blockingCommandInputSchema>;
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
import "core-js/proposals/async-explicit-resource-management.js";
|
|
2
|
+
import { z } from "zod";
|
|
3
|
+
import { tabIdSchema } from "./utilities/tabId.js";
|
|
4
|
+
export const blockingCommandInputSchema = z
|
|
5
|
+
.object({
|
|
6
|
+
command: z.string(),
|
|
7
|
+
shell: z.string().optional(),
|
|
8
|
+
tabId: tabIdSchema,
|
|
9
|
+
allowFailure: z.boolean().optional(),
|
|
10
|
+
// absolute cwd
|
|
11
|
+
cwd: z.string().optional(),
|
|
12
|
+
cwdRelative: z.string().optional(),
|
|
13
|
+
envOverrides: z.record(z.string()).optional(),
|
|
14
|
+
uid: z.number().optional(),
|
|
15
|
+
gid: z.number().optional(),
|
|
16
|
+
})
|
|
17
|
+
.refine(data =>
|
|
18
|
+
// disallow both cwd and cwdRelative
|
|
19
|
+
!(data.cwd && data.cwdRelative), { message: "Both cwd and cwdRelative provided. Please provide either but not both at the same time." });
|
|
20
|
+
//# sourceMappingURL=blockingCommandInputSchema.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"blockingCommandInputSchema.js","sourceRoot":"","sources":["../../../src/server/blockingCommandInputSchema.ts"],"names":[],"mappings":"AAAA,OAAO,yDAAyD,CAAA;AAEhE,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AACvB,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAElD,MAAM,CAAC,MAAM,0BAA0B,GAAG,CAAC;KACxC,MAAM,CAAC;IACN,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE;IACnB,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC5B,KAAK,EAAE,WAAW;IAClB,YAAY,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE;IAEpC,eAAe;IACf,GAAG,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC1B,WAAW,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAClC,YAAY,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,QAAQ,EAAE;IAC7C,GAAG,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC1B,GAAG,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;CAC3B,CAAC;KACD,MAAM,CACL,IAAI,CAAC,EAAE;AACL,oCAAoC;AACpC,CAAC,CAAC,IAAI,CAAC,GAAG,IAAI,IAAI,CAAC,WAAW,CAAC,EACjC,EAAE,OAAO,EAAE,yFAAyF,EAAE,CACvG,CAAA"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
import { blockingCommandInputSchema } from "./blockingCommandInputSchema.js";
|
|
2
|
+
describe("blockingCommandInputSchema", () => {
|
|
3
|
+
it("allows either cwd or cwdRelative but not both", () => {
|
|
4
|
+
// It doesn't make sense to have two sources of truth for the cwd.
|
|
5
|
+
const fails = blockingCommandInputSchema.safeParse({
|
|
6
|
+
command: "command",
|
|
7
|
+
tabId: { tabId: "123" },
|
|
8
|
+
cwd: "cwd",
|
|
9
|
+
cwdRelative: "cwdRelative",
|
|
10
|
+
});
|
|
11
|
+
expect(fails.error).toMatchInlineSnapshot(`
|
|
12
|
+
[ZodError: [
|
|
13
|
+
{
|
|
14
|
+
"code": "custom",
|
|
15
|
+
"message": "Both cwd and cwdRelative provided. Please provide either but not both at the same time.",
|
|
16
|
+
"path": []
|
|
17
|
+
}
|
|
18
|
+
]]
|
|
19
|
+
`);
|
|
20
|
+
});
|
|
21
|
+
});
|
|
22
|
+
//# sourceMappingURL=blockingCommandInputSchema.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"blockingCommandInputSchema.test.js","sourceRoot":"","sources":["../../../src/server/blockingCommandInputSchema.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,0BAA0B,EAA6B,MAAM,iCAAiC,CAAA;AAEvG,QAAQ,CAAC,4BAA4B,EAAE,GAAG,EAAE;IAC1C,EAAE,CAAC,+CAA+C,EAAE,GAAG,EAAE;QACvD,kEAAkE;QAClE,MAAM,KAAK,GAAG,0BAA0B,CAAC,SAAS,CAAC;YACjD,OAAO,EAAE,SAAS;YAClB,KAAK,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE;YACvB,GAAG,EAAE,KAAK;YACV,WAAW,EAAE,aAAa;SACa,CAAC,CAAA;QAE1C,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,qBAAqB,CAAC;;;;;;;;KAQzC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA"}
|
|
@@ -12,11 +12,7 @@ import type {
|
|
|
12
12
|
GenericNeovimBrowserApi,
|
|
13
13
|
GenericTerminalBrowserApi,
|
|
14
14
|
} from "@tui-sandbox/library/dist/src/browser/neovim-client"
|
|
15
|
-
import type {
|
|
16
|
-
BlockingCommandClientInput,
|
|
17
|
-
ExCommandClientInput,
|
|
18
|
-
LuaCodeClientInput,
|
|
19
|
-
} from "@tui-sandbox/library/dist/src/server/server"
|
|
15
|
+
import type { ExCommandClientInput, LuaCodeClientInput } from "@tui-sandbox/library/dist/src/server/server"
|
|
20
16
|
import type {
|
|
21
17
|
BlockingShellCommandOutput,
|
|
22
18
|
RunExCommandOutput,
|
|
@@ -24,6 +20,7 @@ import type {
|
|
|
24
20
|
StartNeovimGenericArguments,
|
|
25
21
|
TestDirectory,
|
|
26
22
|
} from "@tui-sandbox/library/dist/src/server/types"
|
|
23
|
+
import type { BlockingCommandClientInput } from "@tui-sandbox/library/src/server/blockingCommandInputSchema"
|
|
27
24
|
import type { StartTerminalGenericArguments } from "@tui-sandbox/library/src/server/terminal/TerminalTestApplication"
|
|
28
25
|
import type { OverrideProperties } from "type-fest"
|
|
29
26
|
import type { MyTestDirectory, MyTestDirectoryFile } from "../../MyTestDirectory"
|
|
@@ -35,7 +32,7 @@ export type TerminalTestApplicationContext = {
|
|
|
35
32
|
|
|
36
33
|
/** Runs a shell command in a blocking manner, waiting for the command to
|
|
37
34
|
* finish before returning. Requires the terminal to be running. */
|
|
38
|
-
runBlockingShellCommand(input:
|
|
35
|
+
runBlockingShellCommand(input: MyBlockingCommandClientInput): Cypress.Chainable<BlockingShellCommandOutput>
|
|
39
36
|
|
|
40
37
|
/** The test directory, providing type-safe access to its file and directory structure */
|
|
41
38
|
dir: TestDirectory<MyTestDirectory>
|
|
@@ -49,7 +46,7 @@ export type NeovimContext = {
|
|
|
49
46
|
|
|
50
47
|
/** Runs a shell command in a blocking manner, waiting for the command to
|
|
51
48
|
* finish before returning. Requires neovim to be running. */
|
|
52
|
-
runBlockingShellCommand(input:
|
|
49
|
+
runBlockingShellCommand(input: MyBlockingCommandClientInput): Cypress.Chainable<BlockingShellCommandOutput>
|
|
53
50
|
|
|
54
51
|
/** Runs a shell command in a blocking manner, waiting for the command to
|
|
55
52
|
* finish before returning. Requires neovim to be running. */
|
|
@@ -66,7 +63,7 @@ export type NeovimContext = {
|
|
|
66
63
|
|
|
67
64
|
/** Arguments for starting the neovim server. They are built based on your test
|
|
68
65
|
* environment in a type safe manner. */
|
|
69
|
-
type MyStartNeovimServerArguments = OverrideProperties<
|
|
66
|
+
export type MyStartNeovimServerArguments = OverrideProperties<
|
|
70
67
|
StartNeovimGenericArguments,
|
|
71
68
|
{
|
|
72
69
|
filename?: MyTestDirectoryFile | { openInVerticalSplits: MyTestDirectoryFile[] }
|
|
@@ -145,6 +142,11 @@ before(function () {
|
|
|
145
142
|
cy.intercept({ resourceType: /xhr|fetch/ }, { log: false })
|
|
146
143
|
})
|
|
147
144
|
|
|
145
|
+
export type MyBlockingCommandClientInput = OverrideProperties<
|
|
146
|
+
BlockingCommandClientInput,
|
|
147
|
+
{ cwdRelative?: MyTestDirectoryFile | undefined }
|
|
148
|
+
>
|
|
149
|
+
|
|
148
150
|
declare global {
|
|
149
151
|
namespace Cypress {
|
|
150
152
|
interface Chainable {
|
|
@@ -157,7 +159,7 @@ declare global {
|
|
|
157
159
|
|
|
158
160
|
/** Runs a shell command in a blocking manner, waiting for the command to
|
|
159
161
|
* finish before returning. Requires neovim to be running. */
|
|
160
|
-
nvim_runBlockingShellCommand(input:
|
|
162
|
+
nvim_runBlockingShellCommand(input: MyBlockingCommandClientInput): Chainable<BlockingShellCommandOutput>
|
|
161
163
|
|
|
162
164
|
nvim_runLuaCode(input: LuaCodeClientInput): Chainable<RunLuaCodeOutput>
|
|
163
165
|
|
|
@@ -166,7 +168,7 @@ declare global {
|
|
|
166
168
|
*/
|
|
167
169
|
nvim_runExCommand(input: ExCommandClientInput): Chainable<RunExCommandOutput>
|
|
168
170
|
|
|
169
|
-
terminal_runBlockingShellCommand(input:
|
|
171
|
+
terminal_runBlockingShellCommand(input: MyBlockingCommandClientInput): Chainable<BlockingShellCommandOutput>
|
|
170
172
|
}
|
|
171
173
|
}
|
|
172
174
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"contents.js","sourceRoot":"","sources":["../../../../src/server/cypress-support/contents.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,UAAU,CAAA;AAChD,OAAO,EAAE,aAAa,EAAE,MAAM,KAAK,CAAA;AAEnC,MAAM,UAAU,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;AAEjD,MAAM,CAAC,KAAK,UAAU,gCAAgC;IACpD,uEAAuE;IACvE,2BAA2B;IAC3B,IAAI,IAAI,GAAG
|
|
1
|
+
{"version":3,"file":"contents.js","sourceRoot":"","sources":["../../../../src/server/cypress-support/contents.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,UAAU,CAAA;AAChD,OAAO,EAAE,aAAa,EAAE,MAAM,KAAK,CAAA;AAEnC,MAAM,UAAU,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;AAEjD,MAAM,CAAC,KAAK,UAAU,gCAAgC;IACpD,uEAAuE;IACvE,2BAA2B;IAC3B,IAAI,IAAI,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA2LZ,CAAA;IAEC,MAAM,OAAO,GAAG,MAAM,aAAa,CAAC,UAAU,CAAC,CAAA;IAC/C,IAAI,GAAG,MAAM,MAAM,CAAC,IAAI,EAAE,EAAE,GAAG,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,CAAC,CAAA;IAE/D,OAAO,IAAI,CAAA;AACb,CAAC"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import "core-js/proposals/async-explicit-resource-management.js";
|
|
2
|
-
import type { BlockingCommandInput
|
|
2
|
+
import type { BlockingCommandInput } from "../blockingCommandInputSchema.js";
|
|
3
|
+
import type { ExCommandInput, LuaCodeInput } from "../server.js";
|
|
3
4
|
import type { BlockingShellCommandOutput, RunExCommandOutput, RunLuaCodeOutput, StartNeovimGenericArguments, TestDirectory } from "../types.js";
|
|
4
5
|
import type { DirectoriesConfig } from "../updateTestdirectorySchemaFile.js";
|
|
5
6
|
import type { TabId } from "../utilities/tabId.js";
|
|
@@ -136,7 +136,7 @@ export async function runBlockingShellCommand(signal, input, allowFailure) {
|
|
|
136
136
|
const testDirectory = neovim.state?.testDirectory;
|
|
137
137
|
assert(testDirectory, `Test directory not found for client id ${input.tabId.tabId}. Maybe neovim's not started yet?`);
|
|
138
138
|
const env = neovim.getEnvironmentVariables(testDirectory, input.envOverrides);
|
|
139
|
-
return executeBlockingShellCommand(input, signal, allowFailure, env);
|
|
139
|
+
return executeBlockingShellCommand(testDirectory, input, signal, allowFailure, env);
|
|
140
140
|
}
|
|
141
141
|
export async function runLuaCode(options) {
|
|
142
142
|
const neovim = neovims.get(options.tabId.tabId);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/server/neovim/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,OAAO,MAAM,MAAM,QAAQ,CAAA;AAC3B,OAAO,yDAAyD,CAAA;AAChE,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AACpC,OAAO,IAAI,MAAM,MAAM,CAAA;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/server/neovim/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,OAAO,MAAM,MAAM,QAAQ,CAAA;AAC3B,OAAO,yDAAyD,CAAA;AAChE,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AACpC,OAAO,IAAI,MAAM,MAAM,CAAA;AAGvB,OAAO,EAAE,2BAA2B,EAAE,MAAM,wCAAwC,CAAA;AASpF,OAAO,EAAE,mCAAmC,EAAE,MAAM,2BAA2B,CAAA;AAC/E,OAAO,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAA;AAG3C,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAA;AAC1D,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAA;AAEtE,MAAM,OAAO,GAAG,IAAI,GAAG,EAAqC,CAAA;AAC5D,MAAM,SAAS,GAA+B,IAAI,IAAI,CAAC,GAAG,EAAE;IAC1D,OAAO,IAAI,oBAAoB,EAAE,CAAA;AACnC,CAAC,CAAC,CAAA;AAEF,MAAM,CAAC,KAAK,UAAU,mBAAmB,CAAC,mBAA2B,EAAE,MAAyB;;;QAC9F,MAAY,GAAG,kCAAG,IAAI,iBAAiB,CAAC,mBAAmB,CAAC,OAAA,CAAA;QAC5D,MAAM,aAAa,GAAG,MAAM,uBAAuB,CAAC,MAAM,CAAC,CAAA;QAC3D,MAAM,eAAe,GAAG,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,gBAAgB,EAAE,SAAS,EAAE,MAAM,EAAE,aAAa,CAAC,CAAA;QACnG,IAAI,CAAC;YACH,MAAM,MAAM,CAAC,eAAe,CAAC,CAAA;QAC/B,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,OAAO,CAAC,GAAG,CACT,0CAA0C,eAAe,6EAA6E,CACvI,CAAA;YACD,OAAM;QACR,CAAC;QAED,OAAO,CAAC,GAAG,CAAC,qCAAqC,eAAe,KAAK,CAAC,CAAA;QAEtE,IAAI,MAAM,GAAG,EAAE,CAAA;QACf,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,QAAwC,EAAE,IAAI,CAAC,EAAE;YAC7D,MAAM,CAAC,IAAI,CAAC,CAAA;YACZ,MAAM,CAAC,OAAO,IAAI,KAAK,QAAQ,CAAC,CAAA;YAChC,MAAM,IAAI,IAAI,CAAA;QAChB,CAAC,CAAC,CAAA;QACF,MAAM,GAAG,CAAC,uBAAuB,CAC/B,aAAa,EACb,EAAE,QAAQ,EAAE,WAAW,EAAE,WAAW,EAAE,eAAe,eAAe,IAAI,EAAE,EAC1E,EAAE,IAAI,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,CACvB,CAAA;QACD,MAAM,GAAG,CAAC,WAAW,CAAC,SAAS,EAAE,CAAA;QACjC,OAAO,CAAC,GAAG,CAAC,uCAAuC,CAAC,CAAA;QACpD,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;;;;;;;;;;;CACpB;AAED,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,OAA0B,EAC1B,MAA+B,EAC/B,mBAA2B;IAE3B,MAAM,KAAK,GAAG,OAAO,CAAC,MAAM,CAAC,KAAK,CAAA;IAClC,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,IAAI,iBAAiB,CAAC,mBAAmB,CAAC,CAAA;IAC/E,IAAI,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,SAAS,EAAE,CAAC;QACrC,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,CAAC,CAAA;QAC1B,SAAS,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,MAAM,EAAE,KAAK,EAAC,CAAC,EAAC,EAAE;YACtC,MAAM,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE,CAAA;QAChC,CAAC,CAAC,CAAA;IACJ,CAAC;IAED,MAAM,MAAM,GAAG,mCAAmC,CAAC,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAA;IAC3E,IAAI,MAAM,EAAE,CAAC;QACX,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,GAAG,EAAE;YACpC,KAAK,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE;gBAC9C,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;YACvB,CAAC,CAAC,CAAA;QACJ,CAAC,CAAC,CAAA;IACJ,CAAC;IAED,OAAO,MAAM,CAAA;AACf,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,KAAK,CACzB,OAAoC,EACpC,kBAAsC,EACtC,KAAY,EACZ,MAAyB;IAEzB,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;IACvC,MAAM,CAAC,MAAM,EAAE,2CAA2C,KAAK,CAAC,KAAK,EAAE,CAAC,CAAA;IAExE,MAAM,aAAa,GAAG,MAAM,uBAAuB,CAAC,MAAM,CAAC,CAAA;IAC3D,MAAM,MAAM,CAAC,uBAAuB,CAAC,aAAa,EAAE,OAAO,EAAE,kBAAkB,CAAC,CAAA;IAEhF,OAAO,aAAa,CAAA;AACtB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,SAAS,CAAC,OAAuC;IACrE,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;IAC/C,MAAM,CACJ,MAAM,KAAK,SAAS,EACpB,yFAAyF,CAC1F,CAAA;IACD,MAAM,CACJ,MAAM,CAAC,WAAW,EAClB,8CAA8C,OAAO,CAAC,KAAK,CAAC,KAAK,+BAA+B,CACjG,CAAA;IAED,MAAM,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;AAC9C,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAC3C,MAA+B,EAC/B,KAA2B,EAC3B,YAAqB;IAErB,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;IAC7C,MAAM,CACJ,MAAM,KAAK,SAAS,EACpB,6GAA6G,CAC9G,CAAA;IACD,MAAM,aAAa,GAAG,MAAM,CAAC,KAAK,EAAE,aAAa,CAAA;IACjD,MAAM,CAAC,aAAa,EAAE,0CAA0C,KAAK,CAAC,KAAK,CAAC,KAAK,mCAAmC,CAAC,CAAA;IAErH,MAAM,GAAG,GAAG,MAAM,CAAC,uBAAuB,CAAC,aAAa,EAAE,KAAK,CAAC,YAAY,CAAC,CAAA;IAC7E,OAAO,2BAA2B,CAAC,aAAa,EAAE,KAAK,EAAE,MAAM,EAAE,YAAY,EAAE,GAAG,CAAC,CAAA;AACrF,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,UAAU,CAAC,OAAqB;IACpD,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;IAC/C,MAAM,CACJ,MAAM,KAAK,SAAS,EACpB,+FAA+F,CAChG,CAAA;IACD,MAAM,CACJ,MAAM,CAAC,WAAW,EAClB,8CAA8C,OAAO,CAAC,KAAK,CAAC,KAAK,+BAA+B,CACjG,CAAA;IAED,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,GAAG,EAAE,CAAA;IAC5C,IAAI,CAAC,GAAG,EAAE,CAAC;QACT,MAAM,IAAI,KAAK,CAAC,0CAA0C,OAAO,CAAC,KAAK,CAAC,KAAK,+BAA+B,CAAC,CAAA;IAC/G,CAAC;IAED,OAAO,CAAC,GAAG,CAAC,UAAU,MAAM,CAAC,WAAW,CAAC,SAAS,EAAE,sBAAsB,OAAO,CAAC,OAAO,EAAE,CAAC,CAAA;IAC5F,IAAI,CAAC;QACH,MAAM,KAAK,GAAG,MAAM,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,CAAA;QAC5C,OAAO,EAAE,KAAK,EAAE,CAAA;IAClB,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,OAAO,CAAC,IAAI,CAAC,2BAA2B,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAA;QAC7D,MAAM,IAAI,KAAK,CAAC,2BAA2B,OAAO,CAAC,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAA;IAC7E,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,YAAY,CAAC,OAAuB;IACxD,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;IAC/C,MAAM,CACJ,MAAM,KAAK,SAAS,EACpB,+FAA+F,CAChG,CAAA;IACD,MAAM,CACJ,MAAM,CAAC,WAAW,EAClB,8CAA8C,OAAO,CAAC,KAAK,CAAC,KAAK,+BAA+B,CACjG,CAAA;IAED,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,GAAG,EAAE,CAAA;IAC5C,IAAI,CAAC,GAAG,EAAE,CAAC;QACT,MAAM,IAAI,KAAK,CAAC,0CAA0C,OAAO,CAAC,KAAK,CAAC,KAAK,+BAA+B,CAAC,CAAA;IAC/G,CAAC;IAED,OAAO,CAAC,GAAG,CAAC,UAAU,MAAM,CAAC,WAAW,CAAC,SAAS,EAAE,wBAAwB,OAAO,CAAC,OAAO,EAAE,CAAC,CAAA;IAC9F,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,MAAM,GAAG,CAAC,aAAa,CAAC,OAAO,CAAC,OAAO,CAAC,CAAA;QACvD,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC;YAChB,OAAO,CAAC,GAAG,CAAC,IAAI,OAAO,CAAC,OAAO,YAAY,MAAM,EAAE,CAAC,CAAA;QACtD,CAAC;QACD,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,CAAA;IAC1B,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,OAAO,CAAC,IAAI,CAAC,6BAA6B,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAA;QAC/D,MAAM,IAAI,KAAK,CAAC,6BAA6B,OAAO,CAAC,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAA;IAC/E,CAAC;AACH,CAAC"}
|
|
@@ -4,46 +4,6 @@ import type { Except } from "type-fest";
|
|
|
4
4
|
import { z } from "zod";
|
|
5
5
|
import { TestServer } from "./TestServer.js";
|
|
6
6
|
import type { DirectoriesConfig, TestServerConfig } from "./updateTestdirectorySchemaFile.js";
|
|
7
|
-
declare const blockingCommandInputSchema: z.ZodObject<{
|
|
8
|
-
command: z.ZodString;
|
|
9
|
-
shell: z.ZodOptional<z.ZodString>;
|
|
10
|
-
tabId: z.ZodObject<{
|
|
11
|
-
tabId: z.ZodString;
|
|
12
|
-
}, "strip", z.ZodTypeAny, {
|
|
13
|
-
tabId: string;
|
|
14
|
-
}, {
|
|
15
|
-
tabId: string;
|
|
16
|
-
}>;
|
|
17
|
-
allowFailure: z.ZodOptional<z.ZodBoolean>;
|
|
18
|
-
uid: z.ZodOptional<z.ZodNumber>;
|
|
19
|
-
gid: z.ZodOptional<z.ZodNumber>;
|
|
20
|
-
cwd: z.ZodOptional<z.ZodString>;
|
|
21
|
-
envOverrides: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
|
|
22
|
-
}, "strip", z.ZodTypeAny, {
|
|
23
|
-
command: string;
|
|
24
|
-
tabId: {
|
|
25
|
-
tabId: string;
|
|
26
|
-
};
|
|
27
|
-
cwd?: string | undefined;
|
|
28
|
-
uid?: number | undefined;
|
|
29
|
-
gid?: number | undefined;
|
|
30
|
-
shell?: string | undefined;
|
|
31
|
-
allowFailure?: boolean | undefined;
|
|
32
|
-
envOverrides?: Record<string, string> | undefined;
|
|
33
|
-
}, {
|
|
34
|
-
command: string;
|
|
35
|
-
tabId: {
|
|
36
|
-
tabId: string;
|
|
37
|
-
};
|
|
38
|
-
cwd?: string | undefined;
|
|
39
|
-
uid?: number | undefined;
|
|
40
|
-
gid?: number | undefined;
|
|
41
|
-
shell?: string | undefined;
|
|
42
|
-
allowFailure?: boolean | undefined;
|
|
43
|
-
envOverrides?: Record<string, string> | undefined;
|
|
44
|
-
}>;
|
|
45
|
-
export type BlockingCommandClientInput = Except<BlockingCommandInput, "tabId">;
|
|
46
|
-
export type BlockingCommandInput = z.infer<typeof blockingCommandInputSchema>;
|
|
47
7
|
declare const luaCodeInputSchema: z.ZodObject<{
|
|
48
8
|
tabId: z.ZodObject<{
|
|
49
9
|
tabId: z.ZodString;
|
|
@@ -77,16 +37,16 @@ declare const exCommandInputSchema: z.ZodObject<{
|
|
|
77
37
|
command: z.ZodString;
|
|
78
38
|
log: z.ZodOptional<z.ZodBoolean>;
|
|
79
39
|
}, "strip", z.ZodTypeAny, {
|
|
80
|
-
command: string;
|
|
81
40
|
tabId: {
|
|
82
41
|
tabId: string;
|
|
83
42
|
};
|
|
43
|
+
command: string;
|
|
84
44
|
log?: boolean | undefined;
|
|
85
45
|
}, {
|
|
86
|
-
command: string;
|
|
87
46
|
tabId: {
|
|
88
47
|
tabId: string;
|
|
89
48
|
};
|
|
49
|
+
command: string;
|
|
90
50
|
log?: boolean | undefined;
|
|
91
51
|
}>;
|
|
92
52
|
export type ExCommandClientInput = Except<ExCommandInput, "tabId">;
|
|
@@ -130,25 +90,26 @@ export declare function createAppRouter(config: DirectoriesConfig): Promise<impo
|
|
|
130
90
|
}>;
|
|
131
91
|
sendStdin: import("@trpc/server").TRPCMutationProcedure<{
|
|
132
92
|
input: {
|
|
133
|
-
data: string;
|
|
134
93
|
tabId: {
|
|
135
94
|
tabId: string;
|
|
136
95
|
};
|
|
96
|
+
data: string;
|
|
137
97
|
};
|
|
138
98
|
output: void;
|
|
139
99
|
}>;
|
|
140
100
|
runBlockingShellCommand: import("@trpc/server").TRPCMutationProcedure<{
|
|
141
101
|
input: {
|
|
142
|
-
command: string;
|
|
143
102
|
tabId: {
|
|
144
103
|
tabId: string;
|
|
145
104
|
};
|
|
146
|
-
|
|
147
|
-
uid?: number | undefined;
|
|
148
|
-
gid?: number | undefined;
|
|
105
|
+
command: string;
|
|
149
106
|
shell?: string | undefined;
|
|
150
107
|
allowFailure?: boolean | undefined;
|
|
108
|
+
cwd?: string | undefined;
|
|
109
|
+
cwdRelative?: string | undefined;
|
|
151
110
|
envOverrides?: Record<string, string> | undefined;
|
|
111
|
+
uid?: number | undefined;
|
|
112
|
+
gid?: number | undefined;
|
|
152
113
|
};
|
|
153
114
|
output: import("./types.js").BlockingShellCommandOutput;
|
|
154
115
|
}>;
|
|
@@ -188,25 +149,26 @@ export declare function createAppRouter(config: DirectoriesConfig): Promise<impo
|
|
|
188
149
|
}>;
|
|
189
150
|
sendStdin: import("@trpc/server").TRPCMutationProcedure<{
|
|
190
151
|
input: {
|
|
191
|
-
data: string;
|
|
192
152
|
tabId: {
|
|
193
153
|
tabId: string;
|
|
194
154
|
};
|
|
155
|
+
data: string;
|
|
195
156
|
};
|
|
196
157
|
output: void;
|
|
197
158
|
}>;
|
|
198
159
|
runBlockingShellCommand: import("@trpc/server").TRPCMutationProcedure<{
|
|
199
160
|
input: {
|
|
200
|
-
command: string;
|
|
201
161
|
tabId: {
|
|
202
162
|
tabId: string;
|
|
203
163
|
};
|
|
204
|
-
|
|
205
|
-
uid?: number | undefined;
|
|
206
|
-
gid?: number | undefined;
|
|
164
|
+
command: string;
|
|
207
165
|
shell?: string | undefined;
|
|
208
166
|
allowFailure?: boolean | undefined;
|
|
167
|
+
cwd?: string | undefined;
|
|
168
|
+
cwdRelative?: string | undefined;
|
|
209
169
|
envOverrides?: Record<string, string> | undefined;
|
|
170
|
+
uid?: number | undefined;
|
|
171
|
+
gid?: number | undefined;
|
|
210
172
|
};
|
|
211
173
|
output: import("./types.js").BlockingShellCommandOutput;
|
|
212
174
|
}>;
|
|
@@ -221,10 +183,10 @@ export declare function createAppRouter(config: DirectoriesConfig): Promise<impo
|
|
|
221
183
|
}>;
|
|
222
184
|
runExCommand: import("@trpc/server").TRPCMutationProcedure<{
|
|
223
185
|
input: {
|
|
224
|
-
command: string;
|
|
225
186
|
tabId: {
|
|
226
187
|
tabId: string;
|
|
227
188
|
};
|
|
189
|
+
command: string;
|
|
228
190
|
log?: boolean | undefined;
|
|
229
191
|
};
|
|
230
192
|
output: import("./types.js").RunExCommandOutput;
|
|
@@ -1,21 +1,11 @@
|
|
|
1
1
|
import "core-js/proposals/async-explicit-resource-management.js";
|
|
2
2
|
import { z } from "zod";
|
|
3
|
+
import { blockingCommandInputSchema } from "./blockingCommandInputSchema.js";
|
|
3
4
|
import { trpc } from "./connection/trpc.js";
|
|
4
5
|
import * as neovim from "./neovim/index.js";
|
|
5
6
|
import * as terminal from "./terminal/index.js";
|
|
6
7
|
import { TestServer } from "./TestServer.js";
|
|
7
8
|
import { tabIdSchema } from "./utilities/tabId.js";
|
|
8
|
-
const blockingCommandInputSchema = z.object({
|
|
9
|
-
command: z.string(),
|
|
10
|
-
shell: z.string().optional(),
|
|
11
|
-
tabId: tabIdSchema,
|
|
12
|
-
allowFailure: z.boolean().optional(),
|
|
13
|
-
// child_process.ProcessEnvOptions
|
|
14
|
-
uid: z.number().optional(),
|
|
15
|
-
gid: z.number().optional(),
|
|
16
|
-
cwd: z.string().optional(),
|
|
17
|
-
envOverrides: z.record(z.string()).optional(),
|
|
18
|
-
});
|
|
19
9
|
const luaCodeInputSchema = z.object({ tabId: tabIdSchema, luaCode: z.string() });
|
|
20
10
|
const exCommandInputSchema = z.object({
|
|
21
11
|
tabId: tabIdSchema,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../../src/server/server.ts"],"names":[],"mappings":"AACA,OAAO,yDAAyD,CAAA;AAEhE,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AACvB,OAAO,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAA;AAC3C,OAAO,KAAK,MAAM,MAAM,mBAAmB,CAAA;AAC3C,OAAO,KAAK,QAAQ,MAAM,qBAAqB,CAAA;AAC/C,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAE5C,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAElD,MAAM,
|
|
1
|
+
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../../src/server/server.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import "core-js/proposals/async-explicit-resource-management.js";
|
|
2
|
+
import type { BlockingCommandInput } from "../blockingCommandInputSchema.js";
|
|
2
3
|
import type { TerminalDimensions } from "../neovim/NeovimApplication.js";
|
|
3
|
-
import type { BlockingCommandInput } from "../server.js";
|
|
4
4
|
import type { BlockingShellCommandOutput } from "../types.js";
|
|
5
5
|
import type { DirectoriesConfig } from "../updateTestdirectorySchemaFile.js";
|
|
6
6
|
import type { TabId } from "../utilities/tabId.js";
|
|
@@ -47,6 +47,6 @@ export async function runBlockingShellCommand(signal, input, allowFailure) {
|
|
|
47
47
|
const testDirectory = app.state?.testDirectory;
|
|
48
48
|
assert(testDirectory, `Test directory not found for client id ${input.tabId.tabId}. Maybe neovim's not started yet?`);
|
|
49
49
|
const env = app.getEnvironmentVariables(testDirectory, input.envOverrides);
|
|
50
|
-
return executeBlockingShellCommand(input, signal, allowFailure, env);
|
|
50
|
+
return executeBlockingShellCommand(testDirectory, input, signal, allowFailure, env);
|
|
51
51
|
}
|
|
52
52
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/server/terminal/index.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,QAAQ,CAAA;AAC3B,OAAO,yDAAyD,CAAA;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/server/terminal/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,11 @@
|
|
|
1
1
|
import "core-js/proposals/async-explicit-resource-management.js";
|
|
2
|
-
import type { BlockingCommandInput } from "../
|
|
3
|
-
import type { BlockingShellCommandOutput } from "../types.js";
|
|
4
|
-
export declare function executeBlockingShellCommand(input: BlockingCommandInput, signal: AbortSignal | undefined, allowFailure: boolean, env: NodeJS.ProcessEnv): Promise<BlockingShellCommandOutput>;
|
|
2
|
+
import type { BlockingCommandInput } from "../blockingCommandInputSchema.js";
|
|
3
|
+
import type { BlockingShellCommandOutput, TestDirectory } from "../types.js";
|
|
4
|
+
export declare function executeBlockingShellCommand(testDirectory: TestDirectory, input: BlockingCommandInput, signal: AbortSignal | undefined, allowFailure: boolean, env: NodeJS.ProcessEnv): Promise<BlockingShellCommandOutput>;
|
|
5
|
+
export type GetCwdArguments = {
|
|
6
|
+
rootPathAbsolute: string;
|
|
7
|
+
cwdRelative: string | undefined;
|
|
8
|
+
cwdAbsolute: string | undefined;
|
|
9
|
+
home: string;
|
|
10
|
+
};
|
|
11
|
+
export declare function getCwd(args: GetCwdArguments): string;
|
|
@@ -1,20 +1,25 @@
|
|
|
1
1
|
import { exec } from "child_process";
|
|
2
2
|
import "core-js/proposals/async-explicit-resource-management.js";
|
|
3
|
+
import { join } from "path";
|
|
3
4
|
import util from "util";
|
|
4
|
-
export async function executeBlockingShellCommand(input, signal, allowFailure, env) {
|
|
5
|
+
export async function executeBlockingShellCommand(testDirectory, input, signal, allowFailure, env) {
|
|
5
6
|
const execPromise = util.promisify(exec);
|
|
6
|
-
const cwd =
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
gid: input.gid,
|
|
12
|
-
cwd: cwd,
|
|
13
|
-
env,
|
|
7
|
+
const cwd = getCwd({
|
|
8
|
+
rootPathAbsolute: testDirectory.rootPathAbsolute,
|
|
9
|
+
cwdRelative: input.cwdRelative,
|
|
10
|
+
cwdAbsolute: input.cwd,
|
|
11
|
+
home: testDirectory.rootPathAbsolute,
|
|
14
12
|
});
|
|
15
13
|
try {
|
|
16
|
-
const result = await
|
|
17
|
-
|
|
14
|
+
const result = await execPromise(input.command, {
|
|
15
|
+
signal: signal,
|
|
16
|
+
shell: input.shell,
|
|
17
|
+
uid: input.uid,
|
|
18
|
+
gid: input.gid,
|
|
19
|
+
cwd,
|
|
20
|
+
env,
|
|
21
|
+
});
|
|
22
|
+
console.log(`Successfully ran shell blockingCommand (${input.command}) in cwd: '${cwd}' with stdout: ${result.stdout}, stderr: ${result.stderr}`);
|
|
18
23
|
return {
|
|
19
24
|
type: "success",
|
|
20
25
|
stdout: result.stdout,
|
|
@@ -31,4 +36,10 @@ export async function executeBlockingShellCommand(input, signal, allowFailure, e
|
|
|
31
36
|
throw new Error(`Error running shell blockingCommand (${input.command})`, { cause: e });
|
|
32
37
|
}
|
|
33
38
|
}
|
|
39
|
+
export function getCwd(args) {
|
|
40
|
+
if (args.cwdRelative) {
|
|
41
|
+
return join(args.rootPathAbsolute, args.cwdRelative);
|
|
42
|
+
}
|
|
43
|
+
return args.cwdAbsolute ?? args.home;
|
|
44
|
+
}
|
|
34
45
|
//# sourceMappingURL=runBlockingShellCommand.js.map
|