fixup cookie only types

Author: fredr

pkg/clientgen/testdata/tsapp/expected_shared.ts

@@ -119,7 +119,7 @@ export namespace svc {
             this.root = this.root.bind(this)
         }
 
-        public async cookieDummy(params: RequestType<typeof api_svc_svc_cookieDummy>): Promise<ResponseType<typeof api_svc_svc_cookieDummy>> {
+        public async cookieDummy(params: RequestType<typeof api_svc_svc_cookieDummy>): Promise<void> {
             // Convert our params into the objects we need for the request
             const headers = makeRecord<string, string>({
                 baz: params.headerBaz,
@@ -140,7 +140,7 @@ export namespace svc {
             await this.baseClient.callTypedAPI(`/cookie-dummy`, {headers, query, method: "POST", body: JSON.stringify(body)})
         }
 
-        public async cookiesOnly(params: RequestType<typeof api_svc_svc_cookiesOnly>): Promise<ResponseType<typeof api_svc_svc_cookiesOnly>> {
+        public async cookiesOnly(): Promise<void> {
             await this.baseClient.callTypedAPI(`/cookies-only`, {method: "POST", body: undefined})
         }
 

pkg/clientgen/testdata/tsapp/expected_typescript.ts

@@ -177,7 +177,7 @@ export namespace svc {
             await this.baseClient.callTypedAPI("POST", `/cookie-dummy`, JSON.stringify(body), {headers, query})
         }
 
-        public async cookiesOnly(params: void): Promise<void> {
+        public async cookiesOnly(): Promise<void> {
             await this.baseClient.callTypedAPI("POST", `/cookies-only`)
         }
 

pkg/clientgen/typescript.go

@@ -149,11 +149,8 @@ func (ts *typescript) getFields(typ *schema.Type) []*schema.Field {
 	}
 }
 
-func (ts *typescript) isAuthCookieOnly() bool {
-	if ts.md.AuthHandler == nil {
-		return false
-	}
-	fields := ts.getFields(ts.md.AuthHandler.Params)
+func (ts *typescript) isEmptyObject(typ *schema.Type) bool {
+	fields := ts.getFields(typ)
 	if fields == nil {
 		return false
 	}
@@ -165,6 +162,13 @@ func (ts *typescript) isAuthCookieOnly() bool {
 	return true
 }
 
+func (ts *typescript) isAuthCookieOnly() bool {
+	if ts.md.AuthHandler == nil {
+		return false
+	}
+	return ts.isEmptyObject(ts.md.AuthHandler.Params)
+}
+
 func hasPathParams(rpc *meta.RPC) bool {
 	return fns.Any(rpc.Path.Segments, func(s *meta.PathSegment) bool {
 		return s.Type != meta.PathSegment_LITERAL
@@ -331,7 +335,7 @@ func (ts *typescript) writeService(svc *meta.Service, p clientgentypes.ServiceSe
 			segmentPrefix = payloadName + "."
 		}
 		var isStream = rpc.StreamingRequest || rpc.StreamingResponse
-		var hasHandshake = rpc.HandshakeSchema != nil
+		var hasHandshake = rpc.HandshakeSchema != nil && !ts.isEmptyObject(rpc.HandshakeSchema)
 		var inlinePathParams = (isRaw || (rpc.RequestSchema == nil && !hasHandshake)) && hasPathParams(rpc) && ts.sharedTypes
 		if inlinePathParams {
 			ts.WriteString(payloadName + ": { ")
@@ -376,7 +380,7 @@ func (ts *typescript) writeService(svc *meta.Service, p clientgentypes.ServiceSe
 			ts.WriteString(" }")
 		}
 
-		if (!isStream && rpc.RequestSchema != nil) || (isStream && hasHandshake) {
+		if (!isStream && (rpc.RequestSchema != nil && !ts.isEmptyObject(rpc.RequestSchema))) || (isStream && hasHandshake) {
 			if !ts.sharedTypes && nParams > 0 {
 				ts.WriteString(", ")
 			}
@@ -415,7 +419,7 @@ func (ts *typescript) writeService(svc *meta.Service, p clientgentypes.ServiceSe
 		}
 
 		writeStreamRequest := func(ns string, numIndents int) {
-			if rpc.RequestSchema == nil {
+			if rpc.RequestSchema == nil || ts.isEmptyObject(rpc.RequestSchema) {
 				ts.WriteString("void")
 			} else if ts.sharedTypes {
 				fmt.Fprintf(ts, "StreamRequest<typeof %s>", rpcImportName(rpc))
@@ -424,7 +428,7 @@ func (ts *typescript) writeService(svc *meta.Service, p clientgentypes.ServiceSe
 			}
 		}
 		writeStreamResponse := func(ns string, numIndents int) {
-			if rpc.ResponseSchema == nil {
+			if rpc.ResponseSchema == nil || ts.isEmptyObject(rpc.ResponseSchema) {
 				ts.WriteString("void")
 			} else if ts.sharedTypes {
 				ts.seenStream = true
@@ -456,7 +460,7 @@ func (ts *typescript) writeService(svc *meta.Service, p clientgentypes.ServiceSe
 				writeStreamResponse(ns, 0)
 				ts.WriteString(">")
 			}
-		} else if rpc.ResponseSchema != nil {
+		} else if rpc.ResponseSchema != nil && !ts.isEmptyObject(rpc.ResponseSchema) {
 			if ts.sharedTypes {
 				fmt.Fprintf(ts, "ResponseType<typeof %s>", rpcImportName(rpc))
 			} else {
@@ -825,6 +829,10 @@ func (ts *typescript) writeNamespace(ns string) {
 }
 
 func (ts *typescript) writeDeclDef(ns string, decl *schema.Decl) {
+	if ts.isEmptyObject(decl.Type) {
+		return
+	}
+
 	if decl.Doc != "" {
 		scanner := bufio.NewScanner(strings.NewReader(decl.Doc))
 		ts.WriteString("    /**\n")