Add Schema field to Spec for introspection

client_ext_test.go

@@ -284,9 +284,10 @@ func (a *assertSchemaInterceptor) WrapUnary(next connect.UnaryFunc) connect.Unar
 			return next(ctx, req)
 		}
 		methodDesc, ok := req.Spec().Schema.(protoreflect.MethodDescriptor)
-		assert.True(a.tb, ok)
-		procedure := fmt.Sprintf("/%s/%s", methodDesc.Parent().FullName(), methodDesc.Name())
-		assert.Equal(a.tb, procedure, req.Spec().Procedure)
+		if assert.True(a.tb, ok) {
+			procedure := fmt.Sprintf("/%s/%s", methodDesc.Parent().FullName(), methodDesc.Name())
+			assert.Equal(a.tb, procedure, req.Spec().Procedure)
+		}
 		return next(ctx, req)
 	}
 }
@@ -298,9 +299,10 @@ func (a *assertSchemaInterceptor) WrapStreamingClient(next connect.StreamingClie
 			return conn
 		}
 		methodDescriptor, ok := spec.Schema.(protoreflect.MethodDescriptor)
-		assert.True(a.tb, ok)
-		procedure := fmt.Sprintf("/%s/%s", methodDescriptor.Parent().FullName(), methodDescriptor.Name())
-		assert.Equal(a.tb, procedure, spec.Procedure)
+		if assert.True(a.tb, ok) {
+			procedure := fmt.Sprintf("/%s/%s", methodDescriptor.Parent().FullName(), methodDescriptor.Name())
+			assert.Equal(a.tb, procedure, spec.Procedure)
+		}
 		return conn
 	}
 }
@@ -311,9 +313,10 @@ func (a *assertSchemaInterceptor) WrapStreamingHandler(next connect.StreamingHan
 			return next(ctx, conn)
 		}
 		methodDesc, ok := conn.Spec().Schema.(protoreflect.MethodDescriptor)
-		assert.True(a.tb, ok)
-		procedure := fmt.Sprintf("/%s/%s", methodDesc.Parent().FullName(), methodDesc.Name())
-		assert.Equal(a.tb, procedure, conn.Spec().Procedure)
+		if assert.True(a.tb, ok) {
+			procedure := fmt.Sprintf("/%s/%s", methodDesc.Parent().FullName(), methodDesc.Name())
+			assert.Equal(a.tb, procedure, conn.Spec().Procedure)
+		}
 		return next(ctx, conn)
 	}
 }

cmd/protoc-gen-connect-go/main.go

@@ -212,8 +212,7 @@ func generateServiceNameConstants(g *protogen.GeneratedFile, services []*protoge
 }
 
 func generateServiceNameVariables(g *protogen.GeneratedFile, file *protogen.File) {
-	wrapComments(g, "These variables are the protoreflect.Descriptor objects for the ", file.Desc.Name(),
-		" service's methods.")
+	wrapComments(g, "These variables are the protoreflect.Descriptor objects for the RPCs defined in this package.")
 	g.P("var (")
 	for _, service := range file.Services {
 		serviceDescName := unexport(fmt.Sprintf("%sServiceDescriptor", service.Desc.Name()))