Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion internal/librarian/rust/create_repo_metadata.go
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ func createRepoMetadata(cfg *config.Config, library *config.Library, sources *so
}

func needsRepoMetadata(model *api.API, library *config.Library) bool {
if len(model.Services) == 0 {
if len(model.Services()) == 0 {
return false
}
if len(library.APIs) == 0 {
Expand Down
80 changes: 6 additions & 74 deletions internal/librarian/rust/generate_prost_hybrid.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
package rust

import (
"cmp"
"context"
"errors"
"fmt"
Expand All @@ -26,7 +25,6 @@ import (

"github.com/googleapis/librarian/internal/config"
"github.com/googleapis/librarian/internal/sidekick/api"
"github.com/googleapis/librarian/internal/sidekick/language"
"github.com/googleapis/librarian/internal/sidekick/parser"
sidekickrust "github.com/googleapis/librarian/internal/sidekick/rust"
"github.com/googleapis/librarian/internal/sidekick/rust_prost"
Expand Down Expand Up @@ -230,67 +228,12 @@ func filterModelToTypes(model *api.API, rootTypeIDs []string, allowGrpcAnyFields
return nil, nil, false, errors.New(strings.TrimSuffix(sb.String(), "\n"))
}

// Collect external top-level messages (e.g. google.type.LatLng) referenced by roots.
// We sort external types by ID because model.AllMessages() iterates over a map whose
// iteration order is randomized by the Go runtime.
var externalMessages []*api.Message
for m := range model.AllMessages() {
if m.ID() != "" && reachableMsgs[m.ID()] && !isWKT(m.ID()) && m.ID() != ".google.rpc.Status" && m.Parent() == nil {
if m.Package() != model.PackageName && m.Package() != api.ReservedPackageName {
externalMessages = append(externalMessages, m)
}
}
}
slices.SortFunc(externalMessages, func(a, b *api.Message) int { return cmp.Compare(a.ID(), b.ID()) })

// Collect external top-level enums referenced by roots.
var externalEnums []*api.Enum
for e := range model.AllEnums() {
if e.ID() != "" && reachableEnums[e.ID()] && !isWKT(e.ID()) && e.Parent() == nil {
if e.Package() != model.PackageName && e.Package() != api.ReservedPackageName {
externalEnums = append(externalEnums, e)
}
hybridModel := model.Filter(func(id string) bool {
if id == "" || isWKT(id) || id == ".google.rpc.Status" {
return false
}
}
slices.SortFunc(externalEnums, func(a, b *api.Enum) int { return cmp.Compare(a.ID(), b.ID()) })

// Construct hybridModel for prost conversion code generation.
hybridModel := api.API{
Name: model.Name,
PackageName: model.PackageName,
Title: model.Title,
Description: model.Description,
Revision: model.Revision,
Services: cloneServices(model.Services),
Messages: language.FilterSlice(model.Messages, func(m *api.Message) bool { return reachableMsgs[m.ID()] }),
ExternalMessages: externalMessages,
Enums: language.FilterSlice(model.Enums, func(e *api.Enum) bool { return reachableEnums[e.ID()] }),
ExternalEnums: externalEnums,
ResourceDefinitions: model.ResourceDefinitions,
QuickstartService: model.QuickstartService,
Codec: model.Codec,
}
for _, s := range hybridModel.Services {
hybridModel.AddService(s)
for _, m := range s.Methods() {
hybridModel.AddMethod(m)
}
}
// Populate messageByID and enumByID with ALL package messages and enums.
// This avoids aliasing model.messageByID while allowing model
// annotation to resolve field types across the entire package.
for m := range model.AllMessages() {
hybridModel.AddMessage(m)
}
for e := range model.AllEnums() {
hybridModel.AddEnum(e)
}
for m := range model.AllMaps() {
hybridModel.AddMap(m)
}
for _, r := range hybridModel.ResourceDefinitions {
hybridModel.AddResource(r)
}
return reachableMsgs[id] || reachableEnums[id]
})

var unusedTypes []string
for m := range model.AllMessages() {
Expand All @@ -305,7 +248,7 @@ func filterModelToTypes(model *api.API, rootTypeIDs []string, allowGrpcAnyFields
}
slices.Sort(unusedTypes)

return &hybridModel, slices.Compact(unusedTypes), hasGoogleRpcStatus, nil
return hybridModel, slices.Compact(unusedTypes), hasGoogleRpcStatus, nil
}

func isAnyType(id string) bool {
Expand All @@ -319,14 +262,3 @@ func isGoogleRpcStatus(id string) bool {
func isWKT(id string) bool {
return strings.HasPrefix(strings.TrimPrefix(id, "."), "google.protobuf.")
}

func cloneServices(services []*api.Service) []*api.Service {
if services == nil {
return nil
}
cloned := make([]*api.Service, len(services))
for i, s := range services {
cloned[i] = s.Clone()
}
return cloned
}
42 changes: 22 additions & 20 deletions internal/librarian/rust/generate_prost_hybrid_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -146,8 +146,8 @@ func TestFilterModelToTypes(t *testing.T) {
t.Fatalf("unexpected error: %v", err)
}

if len(filtered.Messages) != 1 || filtered.Messages[0].ID() != streamingMsg.ID() {
t.Errorf("got messages %v, want [%s]", filtered.Messages, streamingMsg.ID())
if len(filtered.Messages()) != 1 || filtered.Messages()[0].ID() != streamingMsg.ID() {
t.Errorf("got messages %v, want [%s]", filtered.Messages(), streamingMsg.ID())
}
if len(unused) != 1 || unused[0] != unusedMsg.ID() {
t.Errorf("got unused %v, want [%s]", unused, unusedMsg.ID())
Expand All @@ -172,8 +172,8 @@ func TestFilterModelToTypesUnusedFieldLookup(t *testing.T) {
t.Fatalf("unexpected error: %v", err)
}

if len(filtered.Messages) != 1 || filtered.Messages[0].ID() != streamMsg.ID() {
t.Errorf("got messages %v, want [%s]", filtered.Messages, streamMsg.ID())
if len(filtered.Messages()) != 1 || filtered.Messages()[0].ID() != streamMsg.ID() {
t.Errorf("got messages %v, want [%s]", filtered.Messages(), streamMsg.ID())
}
if got := filtered.Message(childData.ID()); got != childData {
t.Errorf("filtered.Message(%q) = %v, want %v", childData.ID(), got, childData)
Expand All @@ -191,9 +191,10 @@ func TestFilterModelToTypesExternalTypes(t *testing.T) {
api.NewTestField("day").WithEnumType(externalEnum),
)

model := api.NewTestAPI([]*api.Message{streamMsg}, []*api.Enum{}, []*api.Service{})
model.AddMessage(externalMsg)
model.AddEnum(externalEnum)
model := api.NewAPIBuilderFrom(api.NewTestAPI([]*api.Message{streamMsg}, []*api.Enum{}, []*api.Service{})).
AddMessage(externalMsg).
AddEnum(externalEnum).
BuildSyntaxTree()
if err := api.CrossReference(model); err != nil {
t.Fatal(err)
}
Expand All @@ -203,14 +204,14 @@ func TestFilterModelToTypesExternalTypes(t *testing.T) {
t.Fatalf("unexpected error: %v", err)
}

if len(filtered.Messages) != 1 || filtered.Messages[0].ID() != streamMsg.ID() {
t.Errorf("got package messages %v, want [%s]", filtered.Messages, streamMsg.ID())
if len(filtered.Messages()) != 1 || filtered.Messages()[0].ID() != streamMsg.ID() {
t.Errorf("got package messages %v, want [%s]", filtered.Messages(), streamMsg.ID())
}
if len(filtered.ExternalMessages) != 1 || filtered.ExternalMessages[0].ID() != externalMsg.ID() {
t.Errorf("got ExternalMessages %v, want [%s]", filtered.ExternalMessages, externalMsg.ID())
if len(filtered.ExternalMessages()) != 1 || filtered.ExternalMessages()[0].ID() != externalMsg.ID() {
t.Errorf("got ExternalMessages %v, want [%s]", filtered.ExternalMessages(), externalMsg.ID())
}
if len(filtered.ExternalEnums) != 1 || filtered.ExternalEnums[0].ID() != externalEnum.ID() {
t.Errorf("got ExternalEnums %v, want [%s]", filtered.ExternalEnums, externalEnum.ID())
if len(filtered.ExternalEnums()) != 1 || filtered.ExternalEnums()[0].ID() != externalEnum.ID() {
t.Errorf("got ExternalEnums %v, want [%s]", filtered.ExternalEnums(), externalEnum.ID())
}
}

Expand Down Expand Up @@ -374,16 +375,17 @@ func TestFilterModelToTypesGoogleRpcStatus(t *testing.T) {
api.NewTestField("status").WithMessageType(statusMsg),
)

statusModel := api.NewTestAPI([]*api.Message{reqMsg}, []*api.Enum{}, []*api.Service{})
statusModel.AddMessage(statusMsg)
statusModel := api.NewAPIBuilderFrom(api.NewTestAPI([]*api.Message{reqMsg}, []*api.Enum{}, []*api.Service{})).
AddMessage(statusMsg).
BuildSyntaxTree()

filtered, unused, hasStatus, err := filterModelToTypes(statusModel, []string{reqMsg.ID()}, nil)
if err != nil {
t.Fatalf("unexpected error for google.rpc.Status: %v", err)
}

if len(filtered.Messages) != 1 {
t.Errorf("got %d messages, want 1 (StreamReq only, google.rpc.Status handled via Codec)", len(filtered.Messages))
if len(filtered.Messages()) != 1 {
t.Errorf("got %d messages, want 1 (StreamReq only, google.rpc.Status handled via Codec)", len(filtered.Messages()))
}

if !hasStatus {
Expand Down Expand Up @@ -474,7 +476,7 @@ func TestFilterModelToTypesMultipleRoots(t *testing.T) {
t.Fatalf("unexpected error: %v", err)
}
var gotMessages []string
for _, m := range filtered.Messages {
for _, m := range filtered.Messages() {
gotMessages = append(gotMessages, m.ID())
}
less := func(a, b string) bool { return a < b }
Expand All @@ -501,7 +503,7 @@ func TestFilterModelToTypesCyclicRecursion(t *testing.T) {
t.Fatalf("unexpected error: %v", err)
}

if len(filtered.Messages) != 1 {
t.Errorf("expected 1 parsed message, got %d", len(filtered.Messages))
if len(filtered.Messages()) != 1 {
t.Errorf("expected 1 parsed message, got %d", len(filtered.Messages()))
}
}
12 changes: 6 additions & 6 deletions internal/librarian/rust/resolve.go
Original file line number Diff line number Diff line change
Expand Up @@ -61,24 +61,24 @@ func findExternalPackages(lib *config.Library, sources *sources.Sources, pc *con
for _, api := range lib.APIs {
ownedPackages[toPackageName(api.Path)] = true
}
for _, s := range model.Services {
for _, s := range model.Services() {
ownedPackages[s.Package()] = true
}
for _, m := range model.Messages {
for _, m := range model.Messages() {
ownedPackages[m.Package()] = true
}
for _, e := range model.Enums {
for _, e := range model.Enums() {
ownedPackages[e.Package()] = true
}
// Identify all dependencies.
var targetIDs []string
for _, s := range model.Services {
for _, s := range model.Services() {
targetIDs = append(targetIDs, s.ID())
}
for _, m := range model.Messages {
for _, m := range model.Messages() {
targetIDs = append(targetIDs, m.ID())
}
for _, e := range model.Enums {
for _, e := range model.Enums() {
targetIDs = append(targetIDs, e.ID())
}
allDeps, err := api.FindDependencies(model, targetIDs)
Expand Down
2 changes: 1 addition & 1 deletion internal/librarian/swift/create_repo_metadata.go
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ func createRepoMetadata(cfg *config.Config, library *config.Library, src *source
}

func needsRepoMetadata(model *api.API, library *config.Library) bool {
if len(model.Services) == 0 {
if len(model.Services()) == 0 {
return false
}
if len(library.APIs) == 0 {
Expand Down
Loading
Loading