ts-procedures 5.10.0 → 5.12.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/agent_config/bin/postinstall.mjs +3 -3
- package/agent_config/bin/setup.mjs +22 -11
- package/agent_config/claude-code/agents/ts-procedures-architect.md +2 -2
- package/agent_config/claude-code/skills/{guide → ts-procedures}/SKILL.md +1 -1
- package/agent_config/claude-code/skills/{guide → ts-procedures}/api-reference.md +11 -8
- package/agent_config/claude-code/skills/{guide → ts-procedures}/patterns.md +8 -2
- package/agent_config/claude-code/skills/{review → ts-procedures-review}/SKILL.md +3 -3
- package/agent_config/claude-code/skills/{scaffold → ts-procedures-scaffold}/SKILL.md +2 -2
- package/agent_config/claude-code/skills/{scaffold → ts-procedures-scaffold}/templates/client.md +4 -4
- package/agent_config/copilot/copilot-instructions.md +6 -5
- package/agent_config/cursor/cursorrules +6 -5
- package/agent_config/lib/install-claude.mjs +35 -87
- package/build/codegen/e2e.test.js +21 -14
- package/build/codegen/e2e.test.js.map +1 -1
- package/build/codegen/emit-index.d.ts +7 -3
- package/build/codegen/emit-index.js +33 -20
- package/build/codegen/emit-index.js.map +1 -1
- package/build/codegen/emit-index.test.js +69 -45
- package/build/codegen/emit-index.test.js.map +1 -1
- package/build/codegen/pipeline.js +4 -5
- package/build/codegen/pipeline.js.map +1 -1
- package/build/codegen/pipeline.test.js +4 -4
- package/build/codegen/pipeline.test.js.map +1 -1
- package/build/src/client/call.d.ts +14 -0
- package/build/src/client/call.js +47 -0
- package/build/src/client/call.js.map +1 -0
- package/build/src/client/call.test.d.ts +1 -0
- package/build/src/client/call.test.js +124 -0
- package/build/src/client/call.test.js.map +1 -0
- package/build/src/client/errors.d.ts +25 -0
- package/build/src/client/errors.js +33 -0
- package/build/src/client/errors.js.map +1 -0
- package/build/src/client/errors.test.d.ts +1 -0
- package/build/src/client/errors.test.js +41 -0
- package/build/src/client/errors.test.js.map +1 -0
- package/build/src/client/fetch-adapter.d.ts +12 -0
- package/build/src/client/fetch-adapter.js +156 -0
- package/build/src/client/fetch-adapter.js.map +1 -0
- package/build/src/client/fetch-adapter.test.d.ts +1 -0
- package/build/src/client/fetch-adapter.test.js +271 -0
- package/build/src/client/fetch-adapter.test.js.map +1 -0
- package/build/src/client/hooks.d.ts +17 -0
- package/build/src/client/hooks.js +40 -0
- package/build/src/client/hooks.js.map +1 -0
- package/build/src/client/hooks.test.d.ts +1 -0
- package/build/src/client/hooks.test.js +163 -0
- package/build/src/client/hooks.test.js.map +1 -0
- package/build/src/client/index.d.ts +22 -0
- package/build/src/client/index.js +67 -0
- package/build/src/client/index.js.map +1 -0
- package/build/src/client/index.test.d.ts +1 -0
- package/build/src/client/index.test.js +231 -0
- package/build/src/client/index.test.js.map +1 -0
- package/build/src/client/request-builder.d.ts +13 -0
- package/build/src/client/request-builder.js +53 -0
- package/build/src/client/request-builder.js.map +1 -0
- package/build/src/client/request-builder.test.d.ts +1 -0
- package/build/src/client/request-builder.test.js +160 -0
- package/build/src/client/request-builder.test.js.map +1 -0
- package/build/src/client/stream.d.ts +27 -0
- package/build/src/client/stream.js +118 -0
- package/build/src/client/stream.js.map +1 -0
- package/build/src/client/stream.test.d.ts +1 -0
- package/build/src/client/stream.test.js +228 -0
- package/build/src/client/stream.test.js.map +1 -0
- package/build/src/client/types.d.ts +78 -0
- package/build/src/client/types.js +3 -0
- package/build/src/client/types.js.map +1 -0
- package/build/src/codegen/bin/cli.d.ts +45 -0
- package/build/src/codegen/bin/cli.js +246 -0
- package/build/src/codegen/bin/cli.js.map +1 -0
- package/build/src/codegen/bin/cli.test.d.ts +1 -0
- package/build/src/codegen/bin/cli.test.js +220 -0
- package/build/src/codegen/bin/cli.test.js.map +1 -0
- package/build/src/codegen/constants.d.ts +1 -0
- package/build/src/codegen/constants.js +2 -0
- package/build/src/codegen/constants.js.map +1 -0
- package/build/src/codegen/e2e.test.d.ts +1 -0
- package/build/src/codegen/e2e.test.js +464 -0
- package/build/src/codegen/e2e.test.js.map +1 -0
- package/build/src/codegen/emit-client-runtime.d.ts +9 -0
- package/build/src/codegen/emit-client-runtime.js +99 -0
- package/build/src/codegen/emit-client-runtime.js.map +1 -0
- package/build/src/codegen/emit-client-runtime.test.d.ts +1 -0
- package/build/src/codegen/emit-client-runtime.test.js +78 -0
- package/build/src/codegen/emit-client-runtime.test.js.map +1 -0
- package/build/src/codegen/emit-client-types.d.ts +8 -0
- package/build/src/codegen/emit-client-types.js +25 -0
- package/build/src/codegen/emit-client-types.js.map +1 -0
- package/build/src/codegen/emit-client-types.test.d.ts +1 -0
- package/build/src/codegen/emit-client-types.test.js +33 -0
- package/build/src/codegen/emit-client-types.test.js.map +1 -0
- package/build/src/codegen/emit-errors.d.ts +19 -0
- package/build/src/codegen/emit-errors.js +59 -0
- package/build/src/codegen/emit-errors.js.map +1 -0
- package/build/src/codegen/emit-errors.test.d.ts +1 -0
- package/build/src/codegen/emit-errors.test.js +175 -0
- package/build/src/codegen/emit-errors.test.js.map +1 -0
- package/build/src/codegen/emit-index.d.ts +12 -0
- package/build/src/codegen/emit-index.js +41 -0
- package/build/src/codegen/emit-index.js.map +1 -0
- package/build/src/codegen/emit-index.test.d.ts +1 -0
- package/build/src/codegen/emit-index.test.js +106 -0
- package/build/src/codegen/emit-index.test.js.map +1 -0
- package/build/src/codegen/emit-scope.d.ts +15 -0
- package/build/src/codegen/emit-scope.js +299 -0
- package/build/src/codegen/emit-scope.js.map +1 -0
- package/build/src/codegen/emit-scope.test.d.ts +1 -0
- package/build/src/codegen/emit-scope.test.js +559 -0
- package/build/src/codegen/emit-scope.test.js.map +1 -0
- package/build/src/codegen/emit-types.d.ts +43 -0
- package/build/src/codegen/emit-types.js +111 -0
- package/build/src/codegen/emit-types.js.map +1 -0
- package/build/src/codegen/emit-types.test.d.ts +1 -0
- package/build/src/codegen/emit-types.test.js +184 -0
- package/build/src/codegen/emit-types.test.js.map +1 -0
- package/build/src/codegen/group-routes.d.ts +23 -0
- package/build/src/codegen/group-routes.js +46 -0
- package/build/src/codegen/group-routes.js.map +1 -0
- package/build/src/codegen/group-routes.test.d.ts +1 -0
- package/build/src/codegen/group-routes.test.js +131 -0
- package/build/src/codegen/group-routes.test.js.map +1 -0
- package/build/src/codegen/index.d.ts +15 -0
- package/build/src/codegen/index.js +16 -0
- package/build/src/codegen/index.js.map +1 -0
- package/build/src/codegen/naming.d.ts +7 -0
- package/build/src/codegen/naming.js +21 -0
- package/build/src/codegen/naming.js.map +1 -0
- package/build/src/codegen/naming.test.d.ts +1 -0
- package/build/src/codegen/naming.test.js +40 -0
- package/build/src/codegen/naming.test.js.map +1 -0
- package/build/src/codegen/pipeline.d.ts +17 -0
- package/build/src/codegen/pipeline.js +78 -0
- package/build/src/codegen/pipeline.js.map +1 -0
- package/build/src/codegen/pipeline.test.d.ts +1 -0
- package/build/src/codegen/pipeline.test.js +269 -0
- package/build/src/codegen/pipeline.test.js.map +1 -0
- package/build/src/codegen/resolve-envelope.d.ts +7 -0
- package/build/src/codegen/resolve-envelope.js +46 -0
- package/build/src/codegen/resolve-envelope.js.map +1 -0
- package/build/src/codegen/resolve-envelope.test.d.ts +1 -0
- package/build/src/codegen/resolve-envelope.test.js +69 -0
- package/build/src/codegen/resolve-envelope.test.js.map +1 -0
- package/build/src/errors.d.ts +33 -0
- package/build/src/errors.js +91 -0
- package/build/src/errors.js.map +1 -0
- package/build/src/errors.test.d.ts +1 -0
- package/build/src/errors.test.js +122 -0
- package/build/src/errors.test.js.map +1 -0
- package/build/src/exports.d.ts +7 -0
- package/build/src/exports.js +8 -0
- package/build/src/exports.js.map +1 -0
- package/build/src/implementations/http/doc-registry.d.ts +12 -0
- package/build/src/implementations/http/doc-registry.js +114 -0
- package/build/src/implementations/http/doc-registry.js.map +1 -0
- package/build/src/implementations/http/doc-registry.test.d.ts +1 -0
- package/build/src/implementations/http/doc-registry.test.js +347 -0
- package/build/src/implementations/http/doc-registry.test.js.map +1 -0
- package/build/src/implementations/http/express-rpc/index.d.ts +94 -0
- package/build/src/implementations/http/express-rpc/index.js +185 -0
- package/build/src/implementations/http/express-rpc/index.js.map +1 -0
- package/build/src/implementations/http/express-rpc/index.test.d.ts +1 -0
- package/build/src/implementations/http/express-rpc/index.test.js +684 -0
- package/build/src/implementations/http/express-rpc/index.test.js.map +1 -0
- package/build/src/implementations/http/express-rpc/types.d.ts +11 -0
- package/build/src/implementations/http/express-rpc/types.js +2 -0
- package/build/src/implementations/http/express-rpc/types.js.map +1 -0
- package/build/src/implementations/http/hono-api/index.d.ts +102 -0
- package/build/src/implementations/http/hono-api/index.js +341 -0
- package/build/src/implementations/http/hono-api/index.js.map +1 -0
- package/build/src/implementations/http/hono-api/index.test.d.ts +1 -0
- package/build/src/implementations/http/hono-api/index.test.js +992 -0
- package/build/src/implementations/http/hono-api/index.test.js.map +1 -0
- package/build/src/implementations/http/hono-api/types.d.ts +13 -0
- package/build/src/implementations/http/hono-api/types.js +2 -0
- package/build/src/implementations/http/hono-api/types.js.map +1 -0
- package/build/src/implementations/http/hono-rpc/index.d.ts +92 -0
- package/build/src/implementations/http/hono-rpc/index.js +161 -0
- package/build/src/implementations/http/hono-rpc/index.js.map +1 -0
- package/build/src/implementations/http/hono-rpc/index.test.d.ts +1 -0
- package/build/src/implementations/http/hono-rpc/index.test.js +803 -0
- package/build/src/implementations/http/hono-rpc/index.test.js.map +1 -0
- package/build/src/implementations/http/hono-rpc/types.d.ts +11 -0
- package/build/src/implementations/http/hono-rpc/types.js +2 -0
- package/build/src/implementations/http/hono-rpc/types.js.map +1 -0
- package/build/src/implementations/http/hono-stream/index.d.ts +120 -0
- package/build/src/implementations/http/hono-stream/index.js +309 -0
- package/build/src/implementations/http/hono-stream/index.js.map +1 -0
- package/build/src/implementations/http/hono-stream/index.test.d.ts +1 -0
- package/build/src/implementations/http/hono-stream/index.test.js +1356 -0
- package/build/src/implementations/http/hono-stream/index.test.js.map +1 -0
- package/build/src/implementations/http/hono-stream/types.d.ts +15 -0
- package/build/src/implementations/http/hono-stream/types.js +2 -0
- package/build/src/implementations/http/hono-stream/types.js.map +1 -0
- package/build/src/implementations/types.d.ts +142 -0
- package/build/src/implementations/types.js +2 -0
- package/build/src/implementations/types.js.map +1 -0
- package/build/src/index.d.ts +165 -0
- package/build/src/index.js +253 -0
- package/build/src/index.js.map +1 -0
- package/build/src/index.test.d.ts +1 -0
- package/build/src/index.test.js +890 -0
- package/build/src/index.test.js.map +1 -0
- package/build/src/schema/compute-schema.d.ts +35 -0
- package/build/src/schema/compute-schema.js +41 -0
- package/build/src/schema/compute-schema.js.map +1 -0
- package/build/src/schema/compute-schema.test.d.ts +1 -0
- package/build/src/schema/compute-schema.test.js +107 -0
- package/build/src/schema/compute-schema.test.js.map +1 -0
- package/build/src/schema/extract-json-schema.d.ts +2 -0
- package/build/src/schema/extract-json-schema.js +12 -0
- package/build/src/schema/extract-json-schema.js.map +1 -0
- package/build/src/schema/extract-json-schema.test.d.ts +1 -0
- package/build/src/schema/extract-json-schema.test.js +23 -0
- package/build/src/schema/extract-json-schema.test.js.map +1 -0
- package/build/src/schema/parser.d.ts +28 -0
- package/build/src/schema/parser.js +170 -0
- package/build/src/schema/parser.js.map +1 -0
- package/build/src/schema/parser.test.d.ts +1 -0
- package/build/src/schema/parser.test.js +120 -0
- package/build/src/schema/parser.test.js.map +1 -0
- package/build/src/schema/resolve-schema-lib.d.ts +12 -0
- package/build/src/schema/resolve-schema-lib.js +11 -0
- package/build/src/schema/resolve-schema-lib.js.map +1 -0
- package/build/src/schema/resolve-schema-lib.test.d.ts +1 -0
- package/build/src/schema/resolve-schema-lib.test.js +17 -0
- package/build/src/schema/resolve-schema-lib.test.js.map +1 -0
- package/build/src/schema/types.d.ts +8 -0
- package/build/src/schema/types.js +2 -0
- package/build/src/schema/types.js.map +1 -0
- package/build/src/stack-utils.d.ts +25 -0
- package/build/src/stack-utils.js +95 -0
- package/build/src/stack-utils.js.map +1 -0
- package/build/src/stack-utils.test.d.ts +1 -0
- package/build/src/stack-utils.test.js +80 -0
- package/build/src/stack-utils.test.js.map +1 -0
- package/docs/ai-agent-setup.md +7 -6
- package/docs/client-and-codegen.md +9 -6
- package/package.json +1 -1
- package/src/codegen/e2e.test.ts +23 -14
- package/src/codegen/emit-index.test.ts +72 -45
- package/src/codegen/emit-index.ts +43 -20
- package/src/codegen/pipeline.test.ts +4 -4
- package/src/codegen/pipeline.ts +4 -5
- /package/agent_config/claude-code/skills/{guide → ts-procedures}/anti-patterns.md +0 -0
- /package/agent_config/claude-code/skills/{review → ts-procedures-review}/checklist.md +0 -0
- /package/agent_config/claude-code/skills/{scaffold → ts-procedures-scaffold}/templates/express-rpc.md +0 -0
- /package/agent_config/claude-code/skills/{scaffold → ts-procedures-scaffold}/templates/hono-api.md +0 -0
- /package/agent_config/claude-code/skills/{scaffold → ts-procedures-scaffold}/templates/hono-rpc.md +0 -0
- /package/agent_config/claude-code/skills/{scaffold → ts-procedures-scaffold}/templates/hono-stream.md +0 -0
- /package/agent_config/claude-code/skills/{scaffold → ts-procedures-scaffold}/templates/procedure.md +0 -0
- /package/agent_config/claude-code/skills/{scaffold → ts-procedures-scaffold}/templates/stream-procedure.md +0 -0
|
@@ -0,0 +1,231 @@
|
|
|
1
|
+
import { describe, it, expect, vi } from 'vitest';
|
|
2
|
+
import { createClient } from './index.js';
|
|
3
|
+
import { ClientRequestError } from './errors.js';
|
|
4
|
+
// ── helpers ───────────────────────────────────────────────
|
|
5
|
+
async function* makeAsyncIterable(items) {
|
|
6
|
+
for (const item of items) {
|
|
7
|
+
yield item;
|
|
8
|
+
}
|
|
9
|
+
}
|
|
10
|
+
function makeAdapter(responseBody = { ok: true }, streamItems = []) {
|
|
11
|
+
return {
|
|
12
|
+
request: vi.fn(async (_req) => ({
|
|
13
|
+
status: 200,
|
|
14
|
+
headers: {},
|
|
15
|
+
body: responseBody,
|
|
16
|
+
})),
|
|
17
|
+
stream: vi.fn(async (_req) => ({
|
|
18
|
+
status: 200,
|
|
19
|
+
headers: {},
|
|
20
|
+
body: makeAsyncIterable(streamItems),
|
|
21
|
+
})),
|
|
22
|
+
};
|
|
23
|
+
}
|
|
24
|
+
function makeCallDescriptor(overrides) {
|
|
25
|
+
return {
|
|
26
|
+
name: 'GetUser',
|
|
27
|
+
scope: 'users',
|
|
28
|
+
path: '/users',
|
|
29
|
+
method: 'GET',
|
|
30
|
+
kind: 'rpc',
|
|
31
|
+
params: { id: '1' },
|
|
32
|
+
...overrides,
|
|
33
|
+
};
|
|
34
|
+
}
|
|
35
|
+
function makeStreamDescriptor(overrides) {
|
|
36
|
+
return {
|
|
37
|
+
name: 'WatchUsers',
|
|
38
|
+
scope: 'users',
|
|
39
|
+
path: '/stream/users',
|
|
40
|
+
method: 'POST',
|
|
41
|
+
kind: 'stream',
|
|
42
|
+
streamMode: 'sse',
|
|
43
|
+
params: {},
|
|
44
|
+
...overrides,
|
|
45
|
+
};
|
|
46
|
+
}
|
|
47
|
+
// ── createClient ──────────────────────────────────────────
|
|
48
|
+
describe('createClient', () => {
|
|
49
|
+
it('creates a client with typed scope callables', () => {
|
|
50
|
+
const adapter = makeAdapter();
|
|
51
|
+
const client = createClient({
|
|
52
|
+
adapter,
|
|
53
|
+
basePath: 'https://api.example.com',
|
|
54
|
+
scopes: (instance) => ({
|
|
55
|
+
users: {
|
|
56
|
+
getUser: (id) => instance.call(makeCallDescriptor({ params: { id } })),
|
|
57
|
+
},
|
|
58
|
+
}),
|
|
59
|
+
});
|
|
60
|
+
expect(client).toHaveProperty('users');
|
|
61
|
+
expect(client.users).toHaveProperty('getUser');
|
|
62
|
+
expect(typeof client.users.getUser).toBe('function');
|
|
63
|
+
});
|
|
64
|
+
it('executes procedure calls through the adapter', async () => {
|
|
65
|
+
const adapter = makeAdapter({ id: '1', name: 'Alice' });
|
|
66
|
+
const client = createClient({
|
|
67
|
+
adapter,
|
|
68
|
+
basePath: 'https://api.example.com',
|
|
69
|
+
scopes: (instance) => ({
|
|
70
|
+
users: {
|
|
71
|
+
getUser: (id) => instance.call(makeCallDescriptor({ params: { id } })),
|
|
72
|
+
},
|
|
73
|
+
}),
|
|
74
|
+
});
|
|
75
|
+
const result = await client.users.getUser('1');
|
|
76
|
+
expect(adapter.request).toHaveBeenCalledOnce();
|
|
77
|
+
expect(result).toEqual({ id: '1', name: 'Alice' });
|
|
78
|
+
});
|
|
79
|
+
it('throws ClientRequestError on non-2xx from scope callable', async () => {
|
|
80
|
+
const adapter = {
|
|
81
|
+
request: vi.fn(async () => ({
|
|
82
|
+
status: 404,
|
|
83
|
+
headers: {},
|
|
84
|
+
body: { message: 'Not Found' },
|
|
85
|
+
})),
|
|
86
|
+
stream: vi.fn(async () => ({
|
|
87
|
+
status: 200,
|
|
88
|
+
headers: {},
|
|
89
|
+
body: makeAsyncIterable([]),
|
|
90
|
+
})),
|
|
91
|
+
};
|
|
92
|
+
const client = createClient({
|
|
93
|
+
adapter,
|
|
94
|
+
basePath: 'https://api.example.com',
|
|
95
|
+
scopes: (instance) => ({
|
|
96
|
+
users: {
|
|
97
|
+
getUser: (id) => instance.call(makeCallDescriptor({ params: { id } })),
|
|
98
|
+
},
|
|
99
|
+
}),
|
|
100
|
+
});
|
|
101
|
+
await expect(client.users.getUser('99')).rejects.toThrow(ClientRequestError);
|
|
102
|
+
});
|
|
103
|
+
it('applies global hooks to all calls', async () => {
|
|
104
|
+
const capturedHeaders = [];
|
|
105
|
+
const adapter = {
|
|
106
|
+
request: vi.fn(async (req) => {
|
|
107
|
+
capturedHeaders.push(req.headers ?? {});
|
|
108
|
+
return { status: 200, headers: {}, body: {} };
|
|
109
|
+
}),
|
|
110
|
+
stream: vi.fn(async () => ({
|
|
111
|
+
status: 200,
|
|
112
|
+
headers: {},
|
|
113
|
+
body: makeAsyncIterable([]),
|
|
114
|
+
})),
|
|
115
|
+
};
|
|
116
|
+
const globalHooks = {
|
|
117
|
+
onBeforeRequest: (ctx) => ({
|
|
118
|
+
...ctx,
|
|
119
|
+
request: { ...ctx.request, headers: { 'x-api-key': 'secret' } },
|
|
120
|
+
}),
|
|
121
|
+
};
|
|
122
|
+
const client = createClient({
|
|
123
|
+
adapter,
|
|
124
|
+
basePath: 'https://api.example.com',
|
|
125
|
+
hooks: globalHooks,
|
|
126
|
+
scopes: (instance) => ({
|
|
127
|
+
users: {
|
|
128
|
+
getUser: () => instance.call(makeCallDescriptor()),
|
|
129
|
+
},
|
|
130
|
+
}),
|
|
131
|
+
});
|
|
132
|
+
await client.users.getUser();
|
|
133
|
+
expect(capturedHeaders[0]?.['x-api-key']).toBe('secret');
|
|
134
|
+
});
|
|
135
|
+
it('streaming works — SSE yield and return via client.stream()', async () => {
|
|
136
|
+
const sseItems = [
|
|
137
|
+
{ data: { n: 1 }, event: 'tick' },
|
|
138
|
+
{ data: { n: 2 }, event: 'tick' },
|
|
139
|
+
{ data: { total: 2 }, event: 'return' },
|
|
140
|
+
];
|
|
141
|
+
const adapter = makeAdapter({}, sseItems);
|
|
142
|
+
const client = createClient({
|
|
143
|
+
adapter,
|
|
144
|
+
basePath: 'https://api.example.com',
|
|
145
|
+
scopes: (instance) => ({
|
|
146
|
+
updates: {
|
|
147
|
+
watch: () => instance.stream(makeStreamDescriptor({ streamMode: 'sse' })),
|
|
148
|
+
},
|
|
149
|
+
}),
|
|
150
|
+
});
|
|
151
|
+
const stream = client.updates.watch();
|
|
152
|
+
const yielded = [];
|
|
153
|
+
for await (const item of stream) {
|
|
154
|
+
yielded.push(item);
|
|
155
|
+
}
|
|
156
|
+
expect(yielded).toEqual([{ n: 1 }, { n: 2 }]);
|
|
157
|
+
await expect(stream.result).resolves.toEqual({ total: 2 });
|
|
158
|
+
});
|
|
159
|
+
it('streaming works — text mode yields raw chunks', async () => {
|
|
160
|
+
const chunks = ['line1\n', 'line2\n'];
|
|
161
|
+
const adapter = makeAdapter({}, chunks);
|
|
162
|
+
const client = createClient({
|
|
163
|
+
adapter,
|
|
164
|
+
basePath: 'https://api.example.com',
|
|
165
|
+
scopes: (instance) => ({
|
|
166
|
+
logs: {
|
|
167
|
+
tail: () => instance.stream(makeStreamDescriptor({ streamMode: 'text', name: 'TailLogs', scope: 'logs' })),
|
|
168
|
+
},
|
|
169
|
+
}),
|
|
170
|
+
});
|
|
171
|
+
const stream = client.logs.tail();
|
|
172
|
+
const received = [];
|
|
173
|
+
for await (const chunk of stream) {
|
|
174
|
+
received.push(chunk);
|
|
175
|
+
}
|
|
176
|
+
expect(received).toEqual(chunks);
|
|
177
|
+
await expect(stream.result).resolves.toBeUndefined();
|
|
178
|
+
});
|
|
179
|
+
it('stream() is synchronous — returns TypedStream immediately (no await needed)', () => {
|
|
180
|
+
const adapter = makeAdapter({}, []);
|
|
181
|
+
const client = createClient({
|
|
182
|
+
adapter,
|
|
183
|
+
basePath: 'https://api.example.com',
|
|
184
|
+
scopes: (instance) => ({
|
|
185
|
+
updates: {
|
|
186
|
+
watch: () => instance.stream(makeStreamDescriptor()),
|
|
187
|
+
},
|
|
188
|
+
}),
|
|
189
|
+
});
|
|
190
|
+
// Must be synchronous — no await
|
|
191
|
+
const stream = client.updates.watch();
|
|
192
|
+
expect(typeof stream[Symbol.asyncIterator]).toBe('function');
|
|
193
|
+
expect(stream).toHaveProperty('result');
|
|
194
|
+
expect(stream.result).toBeInstanceOf(Promise);
|
|
195
|
+
});
|
|
196
|
+
it('applies global hooks to streams', async () => {
|
|
197
|
+
const capturedHeaders = [];
|
|
198
|
+
const adapter = {
|
|
199
|
+
request: vi.fn(async () => { throw new Error('not expected'); }),
|
|
200
|
+
stream: vi.fn(async (req) => {
|
|
201
|
+
capturedHeaders.push(req.headers ?? {});
|
|
202
|
+
return { status: 200, headers: {}, body: makeAsyncIterable([]) };
|
|
203
|
+
}),
|
|
204
|
+
};
|
|
205
|
+
const globalHooks = {
|
|
206
|
+
onBeforeRequest: (ctx) => ({
|
|
207
|
+
...ctx,
|
|
208
|
+
request: { ...ctx.request, headers: { 'x-stream-key': 'stream-secret' } },
|
|
209
|
+
}),
|
|
210
|
+
};
|
|
211
|
+
const client = createClient({
|
|
212
|
+
adapter,
|
|
213
|
+
basePath: 'https://api.example.com',
|
|
214
|
+
hooks: globalHooks,
|
|
215
|
+
scopes: (instance) => ({
|
|
216
|
+
updates: {
|
|
217
|
+
watch: () => instance.stream(makeStreamDescriptor()),
|
|
218
|
+
},
|
|
219
|
+
}),
|
|
220
|
+
});
|
|
221
|
+
const stream = client.updates.watch();
|
|
222
|
+
for await (const _ of stream) { /* drain */ }
|
|
223
|
+
expect(capturedHeaders[0]?.['x-stream-key']).toBe('stream-secret');
|
|
224
|
+
});
|
|
225
|
+
it('barrel exports: re-exports ClientRequestError', async () => {
|
|
226
|
+
// This verifies the exports are accessible — the import at the top covers this
|
|
227
|
+
const { ClientRequestError: CRE } = await import('./index.js');
|
|
228
|
+
expect(CRE).toBeDefined();
|
|
229
|
+
});
|
|
230
|
+
});
|
|
231
|
+
//# sourceMappingURL=index.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.test.js","sourceRoot":"","sources":["../../../src/client/index.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
import type { AdapterRequest, CallDescriptor } from './types.js';
|
|
2
|
+
/**
|
|
3
|
+
* Replaces `:paramName` segments in `path` with URI-encoded values from `params`.
|
|
4
|
+
* Throws `ClientPathParamError` if a required segment is missing from `params`.
|
|
5
|
+
*/
|
|
6
|
+
export declare function interpolatePath(path: string, params: Record<string, unknown>, procedureName: string): string;
|
|
7
|
+
/**
|
|
8
|
+
* Builds an `AdapterRequest` from a `CallDescriptor` and a base URL.
|
|
9
|
+
*
|
|
10
|
+
* - `kind === 'rpc'` or `kind === 'stream'`: params are flat — sent as the JSON body.
|
|
11
|
+
* - `kind === 'api'`: params are structured channels — `pathParams`, `query`, `body`, `headers`.
|
|
12
|
+
*/
|
|
13
|
+
export declare function buildAdapterRequest(descriptor: CallDescriptor, basePath: string): AdapterRequest;
|
|
@@ -0,0 +1,53 @@
|
|
|
1
|
+
import { ClientPathParamError } from './errors.js';
|
|
2
|
+
/**
|
|
3
|
+
* Replaces `:paramName` segments in `path` with URI-encoded values from `params`.
|
|
4
|
+
* Throws `ClientPathParamError` if a required segment is missing from `params`.
|
|
5
|
+
*/
|
|
6
|
+
export function interpolatePath(path, params, procedureName) {
|
|
7
|
+
return path.replace(/:([A-Za-z_][A-Za-z0-9_]*)/g, (_match, key) => {
|
|
8
|
+
const value = params[key];
|
|
9
|
+
if (value === undefined || value === null) {
|
|
10
|
+
throw new ClientPathParamError(key, path, procedureName);
|
|
11
|
+
}
|
|
12
|
+
return encodeURIComponent(String(value));
|
|
13
|
+
});
|
|
14
|
+
}
|
|
15
|
+
/**
|
|
16
|
+
* Builds an `AdapterRequest` from a `CallDescriptor` and a base URL.
|
|
17
|
+
*
|
|
18
|
+
* - `kind === 'rpc'` or `kind === 'stream'`: params are flat — sent as the JSON body.
|
|
19
|
+
* - `kind === 'api'`: params are structured channels — `pathParams`, `query`, `body`, `headers`.
|
|
20
|
+
*/
|
|
21
|
+
export function buildAdapterRequest(descriptor, basePath) {
|
|
22
|
+
const { name, path, method, kind, params } = descriptor;
|
|
23
|
+
if (kind === 'rpc' || kind === 'stream') {
|
|
24
|
+
return {
|
|
25
|
+
url: `${basePath}${path}`,
|
|
26
|
+
method,
|
|
27
|
+
body: params,
|
|
28
|
+
};
|
|
29
|
+
}
|
|
30
|
+
// kind === 'api' — params are structured channels
|
|
31
|
+
const structured = (params ?? {});
|
|
32
|
+
// Interpolate path params
|
|
33
|
+
const interpolatedPath = structured.pathParams
|
|
34
|
+
? interpolatePath(path, structured.pathParams, name)
|
|
35
|
+
: path;
|
|
36
|
+
// Build query string
|
|
37
|
+
let url = `${basePath}${interpolatedPath}`;
|
|
38
|
+
if (structured.query && Object.keys(structured.query).length > 0) {
|
|
39
|
+
const searchParams = new URLSearchParams(Object.entries(structured.query).map(([k, v]) => [k, String(v)]));
|
|
40
|
+
url = `${url}?${searchParams.toString()}`;
|
|
41
|
+
}
|
|
42
|
+
// Build headers
|
|
43
|
+
const headers = structured.headers && Object.keys(structured.headers).length > 0
|
|
44
|
+
? structured.headers
|
|
45
|
+
: undefined;
|
|
46
|
+
return {
|
|
47
|
+
url,
|
|
48
|
+
method,
|
|
49
|
+
headers,
|
|
50
|
+
body: structured.body,
|
|
51
|
+
};
|
|
52
|
+
}
|
|
53
|
+
//# sourceMappingURL=request-builder.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"request-builder.js","sourceRoot":"","sources":["../../../src/client/request-builder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAA;AAGlD;;;GAGG;AACH,MAAM,UAAU,eAAe,CAC7B,IAAY,EACZ,MAA+B,EAC/B,aAAqB;IAErB,OAAO,IAAI,CAAC,OAAO,CAAC,4BAA4B,EAAE,CAAC,MAAM,EAAE,GAAW,EAAE,EAAE;QACxE,MAAM,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,CAAA;QACzB,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;YAC1C,MAAM,IAAI,oBAAoB,CAAC,GAAG,EAAE,IAAI,EAAE,aAAa,CAAC,CAAA;QAC1D,CAAC;QACD,OAAO,kBAAkB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAA;IAC1C,CAAC,CAAC,CAAA;AACJ,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,mBAAmB,CAAC,UAA0B,EAAE,QAAgB;IAC9E,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,UAAU,CAAA;IAEvD,IAAI,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,QAAQ,EAAE,CAAC;QACxC,OAAO;YACL,GAAG,EAAE,GAAG,QAAQ,GAAG,IAAI,EAAE;YACzB,MAAM;YACN,IAAI,EAAE,MAAM;SACb,CAAA;IACH,CAAC;IAED,kDAAkD;IAClD,MAAM,UAAU,GAAG,CAAC,MAAM,IAAI,EAAE,CAK/B,CAAA;IAED,0BAA0B;IAC1B,MAAM,gBAAgB,GAAG,UAAU,CAAC,UAAU;QAC5C,CAAC,CAAC,eAAe,CAAC,IAAI,EAAE,UAAU,CAAC,UAAU,EAAE,IAAI,CAAC;QACpD,CAAC,CAAC,IAAI,CAAA;IAER,qBAAqB;IACrB,IAAI,GAAG,GAAG,GAAG,QAAQ,GAAG,gBAAgB,EAAE,CAAA;IAC1C,IAAI,UAAU,CAAC,KAAK,IAAI,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACjE,MAAM,YAAY,GAAG,IAAI,eAAe,CACtC,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CACjE,CAAA;QACD,GAAG,GAAG,GAAG,GAAG,IAAI,YAAY,CAAC,QAAQ,EAAE,EAAE,CAAA;IAC3C,CAAC;IAED,gBAAgB;IAChB,MAAM,OAAO,GACX,UAAU,CAAC,OAAO,IAAI,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,MAAM,GAAG,CAAC;QAC9D,CAAC,CAAC,UAAU,CAAC,OAAO;QACpB,CAAC,CAAC,SAAS,CAAA;IAEf,OAAO;QACL,GAAG;QACH,MAAM;QACN,OAAO;QACP,IAAI,EAAE,UAAU,CAAC,IAAI;KACtB,CAAA;AACH,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1,160 @@
|
|
|
1
|
+
import { describe, it, expect } from 'vitest';
|
|
2
|
+
import { interpolatePath, buildAdapterRequest } from './request-builder.js';
|
|
3
|
+
import { ClientPathParamError } from './errors.js';
|
|
4
|
+
// ── interpolatePath ───────────────────────────────────────
|
|
5
|
+
describe('interpolatePath', () => {
|
|
6
|
+
it('returns path unchanged when no params are present', () => {
|
|
7
|
+
expect(interpolatePath('/users', {}, 'GetUsers')).toBe('/users');
|
|
8
|
+
});
|
|
9
|
+
it('replaces a single :param with the provided value', () => {
|
|
10
|
+
expect(interpolatePath('/users/:id', { id: '42' }, 'GetUser')).toBe('/users/42');
|
|
11
|
+
});
|
|
12
|
+
it('replaces multiple :params in one path', () => {
|
|
13
|
+
expect(interpolatePath('/orgs/:orgId/users/:userId', { orgId: 'acme', userId: '7' }, 'GetUser')).toBe('/orgs/acme/users/7');
|
|
14
|
+
});
|
|
15
|
+
it('URI-encodes param values', () => {
|
|
16
|
+
expect(interpolatePath('/users/:name', { name: 'hello world' }, 'GetUser')).toBe('/users/hello%20world');
|
|
17
|
+
});
|
|
18
|
+
it('throws ClientPathParamError when a required param is missing', () => {
|
|
19
|
+
expect(() => interpolatePath('/users/:id', {}, 'GetUser')).toThrow(ClientPathParamError);
|
|
20
|
+
});
|
|
21
|
+
it('throws with descriptive message containing the param name and path', () => {
|
|
22
|
+
expect(() => interpolatePath('/users/:id', {}, 'GetUser')).toThrow(/id/);
|
|
23
|
+
expect(() => interpolatePath('/users/:id', {}, 'GetUser')).toThrow(/\/users\/:id/);
|
|
24
|
+
});
|
|
25
|
+
it('is a no-op when path has no :params', () => {
|
|
26
|
+
expect(interpolatePath('/static/path', {}, 'Foo')).toBe('/static/path');
|
|
27
|
+
});
|
|
28
|
+
});
|
|
29
|
+
// ── buildAdapterRequest ───────────────────────────────────
|
|
30
|
+
describe('buildAdapterRequest', () => {
|
|
31
|
+
const base = {
|
|
32
|
+
name: 'GetUser',
|
|
33
|
+
scope: 'users',
|
|
34
|
+
path: '/users/:id',
|
|
35
|
+
method: 'GET',
|
|
36
|
+
};
|
|
37
|
+
it('RPC: sends flat params as JSON body', () => {
|
|
38
|
+
const descriptor = {
|
|
39
|
+
...base,
|
|
40
|
+
path: '/rpc/GetUser',
|
|
41
|
+
kind: 'rpc',
|
|
42
|
+
params: { userId: '42', extra: true },
|
|
43
|
+
};
|
|
44
|
+
const req = buildAdapterRequest(descriptor, 'https://api.example.com');
|
|
45
|
+
expect(req.url).toBe('https://api.example.com/rpc/GetUser');
|
|
46
|
+
expect(req.method).toBe('GET');
|
|
47
|
+
expect(req.body).toEqual({ userId: '42', extra: true });
|
|
48
|
+
expect(req.headers).toBeUndefined();
|
|
49
|
+
});
|
|
50
|
+
it('stream: sends flat params as JSON body (same as RPC)', () => {
|
|
51
|
+
const descriptor = {
|
|
52
|
+
...base,
|
|
53
|
+
path: '/stream/Updates',
|
|
54
|
+
kind: 'stream',
|
|
55
|
+
params: { filter: 'active' },
|
|
56
|
+
};
|
|
57
|
+
const req = buildAdapterRequest(descriptor, 'https://api.example.com');
|
|
58
|
+
expect(req.url).toBe('https://api.example.com/stream/Updates');
|
|
59
|
+
expect(req.body).toEqual({ filter: 'active' });
|
|
60
|
+
});
|
|
61
|
+
it('API: interpolates pathParams into URL', () => {
|
|
62
|
+
const descriptor = {
|
|
63
|
+
...base,
|
|
64
|
+
path: '/users/:id',
|
|
65
|
+
kind: 'api',
|
|
66
|
+
params: { pathParams: { id: '99' } },
|
|
67
|
+
};
|
|
68
|
+
const req = buildAdapterRequest(descriptor, 'https://api.example.com');
|
|
69
|
+
expect(req.url).toBe('https://api.example.com/users/99');
|
|
70
|
+
expect(req.body).toBeUndefined();
|
|
71
|
+
});
|
|
72
|
+
it('API: appends query params to the URL', () => {
|
|
73
|
+
const descriptor = {
|
|
74
|
+
...base,
|
|
75
|
+
path: '/users',
|
|
76
|
+
kind: 'api',
|
|
77
|
+
params: { query: { role: 'admin', active: 'true' } },
|
|
78
|
+
};
|
|
79
|
+
const req = buildAdapterRequest(descriptor, 'https://api.example.com');
|
|
80
|
+
expect(req.url).toContain('role=admin');
|
|
81
|
+
expect(req.url).toContain('active=true');
|
|
82
|
+
});
|
|
83
|
+
it('API: sets body from body channel', () => {
|
|
84
|
+
const descriptor = {
|
|
85
|
+
...base,
|
|
86
|
+
path: '/users',
|
|
87
|
+
method: 'POST',
|
|
88
|
+
kind: 'api',
|
|
89
|
+
params: { body: { name: 'Alice', age: 30 } },
|
|
90
|
+
};
|
|
91
|
+
const req = buildAdapterRequest(descriptor, 'https://api.example.com');
|
|
92
|
+
expect(req.body).toEqual({ name: 'Alice', age: 30 });
|
|
93
|
+
});
|
|
94
|
+
it('API: merges headers channel into request headers', () => {
|
|
95
|
+
const descriptor = {
|
|
96
|
+
...base,
|
|
97
|
+
path: '/users',
|
|
98
|
+
kind: 'api',
|
|
99
|
+
params: { headers: { 'x-tenant-id': 'tenant-123' } },
|
|
100
|
+
};
|
|
101
|
+
const req = buildAdapterRequest(descriptor, 'https://api.example.com');
|
|
102
|
+
expect(req.headers?.['x-tenant-id']).toBe('tenant-123');
|
|
103
|
+
});
|
|
104
|
+
it('API GET with query only — no body', () => {
|
|
105
|
+
const descriptor = {
|
|
106
|
+
...base,
|
|
107
|
+
path: '/search',
|
|
108
|
+
method: 'GET',
|
|
109
|
+
kind: 'api',
|
|
110
|
+
params: { query: { q: 'typescript' } },
|
|
111
|
+
};
|
|
112
|
+
const req = buildAdapterRequest(descriptor, 'https://api.example.com');
|
|
113
|
+
expect(req.url).toContain('q=typescript');
|
|
114
|
+
expect(req.body).toBeUndefined();
|
|
115
|
+
});
|
|
116
|
+
it('API: combines pathParams, query, body, and headers together', () => {
|
|
117
|
+
const descriptor = {
|
|
118
|
+
...base,
|
|
119
|
+
path: '/orgs/:orgId/users/:userId',
|
|
120
|
+
method: 'PUT',
|
|
121
|
+
kind: 'api',
|
|
122
|
+
params: {
|
|
123
|
+
pathParams: { orgId: 'acme', userId: '7' },
|
|
124
|
+
query: { version: '2' },
|
|
125
|
+
body: { name: 'Bob' },
|
|
126
|
+
headers: { 'x-request-id': 'req-xyz' },
|
|
127
|
+
},
|
|
128
|
+
};
|
|
129
|
+
const req = buildAdapterRequest(descriptor, 'https://api.example.com');
|
|
130
|
+
expect(req.url).toContain('/orgs/acme/users/7');
|
|
131
|
+
expect(req.url).toContain('version=2');
|
|
132
|
+
expect(req.body).toEqual({ name: 'Bob' });
|
|
133
|
+
expect(req.headers?.['x-request-id']).toBe('req-xyz');
|
|
134
|
+
});
|
|
135
|
+
it('RPC with keys named "body" and "query" is treated as flat — NOT structured', () => {
|
|
136
|
+
const descriptor = {
|
|
137
|
+
...base,
|
|
138
|
+
path: '/rpc/DoThing',
|
|
139
|
+
kind: 'rpc',
|
|
140
|
+
params: { body: 'literal-body-value', query: 'literal-query-value' },
|
|
141
|
+
};
|
|
142
|
+
const req = buildAdapterRequest(descriptor, 'https://api.example.com');
|
|
143
|
+
// The entire params object goes to body — no query string appended
|
|
144
|
+
expect(req.body).toEqual({ body: 'literal-body-value', query: 'literal-query-value' });
|
|
145
|
+
expect(req.url).toBe('https://api.example.com/rpc/DoThing');
|
|
146
|
+
// Should NOT have a query string derived from params.query
|
|
147
|
+
expect(req.url).not.toContain('?');
|
|
148
|
+
});
|
|
149
|
+
it('prepends basePath to the URL', () => {
|
|
150
|
+
const descriptor = {
|
|
151
|
+
...base,
|
|
152
|
+
path: '/users',
|
|
153
|
+
kind: 'rpc',
|
|
154
|
+
params: {},
|
|
155
|
+
};
|
|
156
|
+
const req = buildAdapterRequest(descriptor, 'https://api.example.com/v1');
|
|
157
|
+
expect(req.url).toBe('https://api.example.com/v1/users');
|
|
158
|
+
});
|
|
159
|
+
});
|
|
160
|
+
//# sourceMappingURL=request-builder.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"request-builder.test.js","sourceRoot":"","sources":["../../../src/client/request-builder.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
import type { ClientAdapter, ClientHooks, StreamDescriptor, TypedStream } from './types.js';
|
|
2
|
+
/**
|
|
3
|
+
* Wraps an AsyncIterable into a TypedStream.
|
|
4
|
+
*
|
|
5
|
+
* SSE mode: each item is `{ data, event?, id? }`.
|
|
6
|
+
* - If `event === 'return'`, the data resolves `.result` and is NOT yielded.
|
|
7
|
+
* - Otherwise, `data` is yielded.
|
|
8
|
+
*
|
|
9
|
+
* Text mode: each item is yielded as-is.
|
|
10
|
+
* - `.result` resolves to `void` on completion.
|
|
11
|
+
*
|
|
12
|
+
* On error: `.result` rejects and the error is re-thrown from the async iterator.
|
|
13
|
+
*/
|
|
14
|
+
export declare function createTypedStream<TYield, TReturn = void>(source: AsyncIterable<unknown>, streamMode: 'sse' | 'text'): TypedStream<TYield, TReturn>;
|
|
15
|
+
/**
|
|
16
|
+
* Executes a streaming procedure call through the adapter.
|
|
17
|
+
*
|
|
18
|
+
* Flow:
|
|
19
|
+
* 1. Build AdapterRequest from descriptor
|
|
20
|
+
* 2. Run onBeforeRequest hooks
|
|
21
|
+
* 3. Call adapter.stream()
|
|
22
|
+
* 4. On adapter error: run onError hooks, re-throw
|
|
23
|
+
* 5. Run onAfterResponse immediately (before iteration), body is null
|
|
24
|
+
* 6. If non-2xx: throw ClientRequestError
|
|
25
|
+
* 7. Return createTypedStream(streamResponse.body, descriptor.streamMode)
|
|
26
|
+
*/
|
|
27
|
+
export declare function executeStream<TYield, TReturn = void>(descriptor: StreamDescriptor, basePath: string, adapter: ClientAdapter, globalHooks: ClientHooks, localHooks: ClientHooks | undefined): Promise<TypedStream<TYield, TReturn>>;
|
|
@@ -0,0 +1,118 @@
|
|
|
1
|
+
import { buildAdapterRequest } from './request-builder.js';
|
|
2
|
+
import { runBeforeRequest, runAfterResponse, runOnError } from './hooks.js';
|
|
3
|
+
import { ClientRequestError } from './errors.js';
|
|
4
|
+
// ── createTypedStream ─────────────────────────────────────
|
|
5
|
+
/**
|
|
6
|
+
* Wraps an AsyncIterable into a TypedStream.
|
|
7
|
+
*
|
|
8
|
+
* SSE mode: each item is `{ data, event?, id? }`.
|
|
9
|
+
* - If `event === 'return'`, the data resolves `.result` and is NOT yielded.
|
|
10
|
+
* - Otherwise, `data` is yielded.
|
|
11
|
+
*
|
|
12
|
+
* Text mode: each item is yielded as-is.
|
|
13
|
+
* - `.result` resolves to `void` on completion.
|
|
14
|
+
*
|
|
15
|
+
* On error: `.result` rejects and the error is re-thrown from the async iterator.
|
|
16
|
+
*/
|
|
17
|
+
export function createTypedStream(source, streamMode) {
|
|
18
|
+
let resolveResult;
|
|
19
|
+
let rejectResult;
|
|
20
|
+
const resultPromise = new Promise((resolve, reject) => {
|
|
21
|
+
resolveResult = resolve;
|
|
22
|
+
rejectResult = reject;
|
|
23
|
+
});
|
|
24
|
+
async function* generate() {
|
|
25
|
+
try {
|
|
26
|
+
if (streamMode === 'sse') {
|
|
27
|
+
let returnValue;
|
|
28
|
+
let hasReturn = false;
|
|
29
|
+
for await (const item of source) {
|
|
30
|
+
const sseItem = item;
|
|
31
|
+
if (sseItem.event === 'return') {
|
|
32
|
+
returnValue = sseItem.data;
|
|
33
|
+
hasReturn = true;
|
|
34
|
+
}
|
|
35
|
+
else {
|
|
36
|
+
yield sseItem.data;
|
|
37
|
+
}
|
|
38
|
+
}
|
|
39
|
+
// Resolve result after iteration completes
|
|
40
|
+
if (hasReturn) {
|
|
41
|
+
resolveResult(returnValue);
|
|
42
|
+
}
|
|
43
|
+
else {
|
|
44
|
+
resolveResult(undefined);
|
|
45
|
+
}
|
|
46
|
+
}
|
|
47
|
+
else {
|
|
48
|
+
// text mode: yield each item as-is
|
|
49
|
+
for await (const item of source) {
|
|
50
|
+
yield item;
|
|
51
|
+
}
|
|
52
|
+
resolveResult(undefined);
|
|
53
|
+
}
|
|
54
|
+
}
|
|
55
|
+
catch (err) {
|
|
56
|
+
rejectResult(err);
|
|
57
|
+
throw err;
|
|
58
|
+
}
|
|
59
|
+
}
|
|
60
|
+
const iterator = generate();
|
|
61
|
+
return {
|
|
62
|
+
[Symbol.asyncIterator]() {
|
|
63
|
+
return iterator;
|
|
64
|
+
},
|
|
65
|
+
result: resultPromise,
|
|
66
|
+
};
|
|
67
|
+
}
|
|
68
|
+
// ── executeStream ─────────────────────────────────────────
|
|
69
|
+
/**
|
|
70
|
+
* Executes a streaming procedure call through the adapter.
|
|
71
|
+
*
|
|
72
|
+
* Flow:
|
|
73
|
+
* 1. Build AdapterRequest from descriptor
|
|
74
|
+
* 2. Run onBeforeRequest hooks
|
|
75
|
+
* 3. Call adapter.stream()
|
|
76
|
+
* 4. On adapter error: run onError hooks, re-throw
|
|
77
|
+
* 5. Run onAfterResponse immediately (before iteration), body is null
|
|
78
|
+
* 6. If non-2xx: throw ClientRequestError
|
|
79
|
+
* 7. Return createTypedStream(streamResponse.body, descriptor.streamMode)
|
|
80
|
+
*/
|
|
81
|
+
export async function executeStream(descriptor, basePath, adapter, globalHooks, localHooks) {
|
|
82
|
+
// 1. Build the initial request
|
|
83
|
+
let request = buildAdapterRequest(descriptor, basePath);
|
|
84
|
+
// 2. Run before-request hooks
|
|
85
|
+
const beforeCtx = await runBeforeRequest({ procedureName: descriptor.name, scope: descriptor.scope, request }, globalHooks, localHooks);
|
|
86
|
+
request = beforeCtx.request;
|
|
87
|
+
// 3. Call the adapter
|
|
88
|
+
let streamResponse;
|
|
89
|
+
try {
|
|
90
|
+
streamResponse = await adapter.stream(request);
|
|
91
|
+
}
|
|
92
|
+
catch (err) {
|
|
93
|
+
// 4. On adapter error: run error hooks, re-throw
|
|
94
|
+
await runOnError({ procedureName: descriptor.name, scope: descriptor.scope, request, error: err }, globalHooks, localHooks);
|
|
95
|
+
throw err;
|
|
96
|
+
}
|
|
97
|
+
// Build an AdapterResponse shape for the hooks (body is null for streams at this point)
|
|
98
|
+
const responseForHooks = {
|
|
99
|
+
status: streamResponse.status,
|
|
100
|
+
headers: streamResponse.headers,
|
|
101
|
+
body: null,
|
|
102
|
+
};
|
|
103
|
+
// 5. Run after-response hooks immediately (before iteration)
|
|
104
|
+
await runAfterResponse({ procedureName: descriptor.name, scope: descriptor.scope, request, response: responseForHooks }, globalHooks, localHooks);
|
|
105
|
+
// 6. Check status after hooks (hooks may mutate responseForHooks.status)
|
|
106
|
+
if (responseForHooks.status < 200 || responseForHooks.status >= 300) {
|
|
107
|
+
throw new ClientRequestError({
|
|
108
|
+
status: responseForHooks.status,
|
|
109
|
+
headers: responseForHooks.headers,
|
|
110
|
+
body: responseForHooks.body,
|
|
111
|
+
procedureName: descriptor.name,
|
|
112
|
+
scope: descriptor.scope,
|
|
113
|
+
});
|
|
114
|
+
}
|
|
115
|
+
// 7. Return the typed stream
|
|
116
|
+
return createTypedStream(streamResponse.body, descriptor.streamMode);
|
|
117
|
+
}
|
|
118
|
+
//# sourceMappingURL=stream.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"stream.js","sourceRoot":"","sources":["../../../src/client/stream.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|