ts-procedures 7.2.0 → 8.0.0

package/src/codegen/e2e.test.ts

@@ -3,7 +3,7 @@ import { generateClient } from './index.js'
 import { mkdirSync, rmSync, readFileSync, writeFileSync, existsSync } from 'node:fs'
 import { join } from 'node:path'
 import { tmpdir } from 'node:os'
-import type { DocEnvelope, RPCHttpRouteDoc, APIHttpRouteDoc, StreamHttpRouteDoc, ErrorDoc } from '../implementations/types.js'
+import type { DocEnvelope, RPCHttpRouteDoc, APIHttpRouteDoc, StreamHttpRouteDoc, HttpStreamRouteDoc, ErrorDoc } from '../implementations/types.js'
 import { runTsc } from './test-helpers/run-tsc.js'
 
 // ---------------------------------------------------------------------------
@@ -39,20 +39,24 @@ const apiRoute: APIHttpRouteDoc = {
   method: 'put',
   scope: 'users',
   jsonSchema: {
-    pathParams: {
-      type: 'object',
-      properties: { id: { type: 'string' } },
-      required: ['id'],
-    },
-    body: {
-      type: 'object',
-      properties: { name: { type: 'string' } },
-      required: ['name'],
+    req: {
+      pathParams: {
+        type: 'object',
+        properties: { id: { type: 'string' } },
+        required: ['id'],
+      },
+      body: {
+        type: 'object',
+        properties: { name: { type: 'string' } },
+        required: ['name'],
+      },
     },
-    response: {
-      type: 'object',
-      properties: { id: { type: 'string' }, name: { type: 'string' } },
-      required: ['id', 'name'],
+    res: {
+      body: {
+        type: 'object',
+        properties: { id: { type: 'string' }, name: { type: 'string' } },
+        required: ['id', 'name'],
+      },
     },
   },
 }
@@ -94,6 +98,34 @@ const streamRoute: StreamHttpRouteDoc = {
   },
 }
 
+const httpStreamRoute: HttpStreamRouteDoc = {
+  kind: 'http-stream',
+  name: 'WatchUsers',
+  scope: 'users',
+  method: 'get',
+  path: '/users/watch',
+  fullPath: '/api/users/watch',
+  streamMode: 'sse',
+  jsonSchema: {
+    req: {
+      query: {
+        type: 'object',
+        properties: { status: { type: 'string' } },
+      },
+    },
+    yield: {
+      type: 'object',
+      properties: { id: { type: 'string' }, event: { type: 'string' } },
+      required: ['id', 'event'],
+    },
+    returnType: {
+      type: 'object',
+      properties: { count: { type: 'number' } },
+      required: ['count'],
+    },
+  },
+}
+
 const procedureErrorDoc: ErrorDoc = {
   name: 'ProcedureError',
   statusCode: 500,
@@ -129,7 +161,7 @@ const envelope: DocEnvelope = {
   basePath: '/api',
   headers: [],
   errors: [procedureErrorDoc, validationErrorDoc],
-  routes: [rpcRoute, apiRoute, streamRoute],
+  routes: [rpcRoute, apiRoute, streamRoute, httpStreamRoute],
 }
 
 // ---------------------------------------------------------------------------
@@ -189,20 +221,20 @@ describe('E2E: generateClient full pipeline', () => {
 
   // ── users.ts — API route ───────────────────────────────────────────────────
 
-  it('users.ts contains UpdateUserParams type', async () => {
+  it('users.ts contains UpdateUserReq type (structured request type)', async () => {
     tmpDir = makeTmpDir()
     await generateClient({ envelope, outDir: tmpDir })
 
     const content = readFileSync(join(tmpDir, 'users.ts'), 'utf-8')
-    expect(content).toContain('UpdateUserParams')
+    expect(content).toContain('UpdateUserReq')
   })
 
-  it('users.ts contains UpdateUserResponse type', async () => {
+  it('users.ts contains UpdateUserResponseBody type', async () => {
     tmpDir = makeTmpDir()
     await generateClient({ envelope, outDir: tmpDir })
 
     const content = readFileSync(join(tmpDir, 'users.ts'), 'utf-8')
-    expect(content).toContain('UpdateUserResponse')
+    expect(content).toContain('UpdateUserResponseBody')
   })
 
   it('users.ts API callable uses fullPath in the path field', async () => {
@@ -289,6 +321,44 @@ describe('E2E: generateClient full pipeline', () => {
     expect(yieldTypeBody).not.toContain('retry')
   })
 
+  // ── users.ts — http-stream route ──────────────────────────────────────────
+
+  it('users.ts contains WatchUsers callable using client.stream with kind http-stream', async () => {
+    tmpDir = makeTmpDir()
+    await generateClient({ envelope, outDir: tmpDir })
+
+    const content = readFileSync(join(tmpDir, 'users.ts'), 'utf-8')
+    expect(content).toContain('client.stream')
+    expect(content).toContain("kind: 'http-stream'")
+  })
+
+  it('users.ts http-stream callable passes params: req (not bare req shorthand)', async () => {
+    tmpDir = makeTmpDir()
+    await generateClient({ envelope, outDir: tmpDir })
+
+    const content = readFileSync(join(tmpDir, 'users.ts'), 'utf-8')
+    // Must be 'params: req,' not just 'req,' — the shorthand drops channel info
+    expect(content).toContain('params: req,')
+    expect(content).not.toMatch(/^\s+req,\s*$/m)
+  })
+
+  it('users.ts http-stream callable uses fullPath', async () => {
+    tmpDir = makeTmpDir()
+    await generateClient({ envelope, outDir: tmpDir })
+
+    const content = readFileSync(join(tmpDir, 'users.ts'), 'utf-8')
+    expect(content).toContain("path: '/api/users/watch'")
+  })
+
+  it('users.ts http-stream callable returns TypedStream', async () => {
+    tmpDir = makeTmpDir()
+    await generateClient({ envelope, outDir: tmpDir })
+
+    const content = readFileSync(join(tmpDir, 'users.ts'), 'utf-8')
+    expect(content).toContain('TypedStream<')
+    expect(content).toContain("streamMode: 'sse'")
+  })
+
   // ── index.ts ───────────────────────────────────────────────────────────────
 
   it('index.ts contains the default Api bindings factory', async () => {
@@ -520,7 +590,7 @@ const typedAdapter: ClientAdapter = {
   async stream(req) {
     const trace: string | undefined = req.meta?.traceId
     void trace
-    return { status: 200, headers: {}, body: (async function*() {})() }
+    return { status: 200, headers: new Headers(), body: (async function*() {})() }
   },
 }
 
@@ -735,7 +805,9 @@ void run
       const content = readFileSync(join(tmpDir, 'users.ts'), 'utf-8')
       expect(content).toContain('export namespace Users {')
       expect(content).toContain('export namespace GetUser {')
-      expect(content).toContain('export namespace UpdateUser {')
+      // API routes now emit Req/Response sub-namespaces instead of a bare UpdateUser namespace
+      expect(content).toContain('export namespace Req {')
+      expect(content).toContain('export namespace Response {')
     })
 
     it('users.ts uses qualified type references in callables', async () => {
@@ -743,9 +815,10 @@ void run
       await generateClient({ envelope, outDir: tmpDir, namespaceTypes: true })
 
       const content = readFileSync(join(tmpDir, 'users.ts'), 'utf-8')
-      // New emission: client.bindCallable<Users.GetUser.Params, Users.GetUser.Response>({...})
+      // RPC route still uses Params/Response naming
       expect(content).toContain('client.bindCallable<Users.GetUser.Params, Users.GetUser.Response>')
-      expect(content).toContain('client.bindCallable<Users.UpdateUser.Params, Users.UpdateUser.Response>')
+      // API route uses Req sub-namespace for params and Response.Body for return
+      expect(content).toContain('client.bindCallable<Users.UpdateUser.Req, Users.UpdateUser.Response.Body>')
     })
 
     it('events.ts wraps stream types in namespace', async () => {
@@ -765,7 +838,8 @@ void run
       const content = readFileSync(join(tmpDir, 'users.ts'), 'utf-8')
       expect(content).not.toContain('export type GetUserParams')
       expect(content).not.toContain('export type GetUserResponse')
-      expect(content).not.toContain('export type UpdateUserPathParams')
+      expect(content).not.toContain('export type UpdateUserReqPathParams')
+      expect(content).not.toContain('export type UpdateUserResponseBody')
     })
 
     it('enumStyle: enum produces named enums inside namespace', async () => {

package/src/codegen/emit-errors.integration.test.ts

@@ -52,7 +52,7 @@ describe('generated _errors.ts — runtime behavior', () => {
         path: '/ping',
         fullPath: '/api/ping',
         method: 'get',
-        jsonSchema: { response: { type: 'object', properties: {} } },
+        jsonSchema: { response: { type: 'object', properties: {} } } as any, // TODO(Phase 8): migrate to new req/res envelope shape
       },
     ],
   }