Skip to content
Merged
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
10 changes: 6 additions & 4 deletions gems/smithy/lib/smithy/vise/structure_parser.rb
Original file line number Diff line number Diff line change
Expand Up @@ -32,22 +32,24 @@ def initialize(model)
@shapes = model['shapes']
end

def shapes_for(structure)
def shapes_for(structure, visited = {})
shapes = {}
_id, structure = structure.first
structure['members']&.each_value { |member| parse_member(member, shapes) }
structure['members']&.each_value { |member| parse_member(member, shapes, visited) }
shapes
end

private

def parse_member(member_ref, shapes)
def parse_member(member_ref, shapes, visited)
target = member_ref['target']
return if visited.include?(target)
return if PRELUDE_SHAPES.include?(target)

shape = @shapes[target]
shapes[target] = shape
shape['members']&.each_value { |member| parse_member(member, shapes) }
visited[target] = true
shape['members']&.each_value { |member| parse_member(member, shapes, visited) }
end
end
end
Expand Down
62 changes: 0 additions & 62 deletions gems/smithy/spec/fixtures/operation_index/model.json

This file was deleted.

30 changes: 0 additions & 30 deletions gems/smithy/spec/fixtures/operation_index/model.smithy

This file was deleted.

31 changes: 31 additions & 0 deletions gems/smithy/spec/fixtures/recursive/model.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
{
"smithy": "2.0",
"shapes": {
"smithy.ruby.tests#Operation": {
"type": "operation",
"input": {
"target": "smithy.ruby.tests#Structure"
},
"output": {
"target": "smithy.ruby.tests#Structure"
}
},
"smithy.ruby.tests#Recursive": {
"type": "service",
"version": "1.0.0",
"operations": [
{
"target": "smithy.ruby.tests#Operation"
}
]
},
"smithy.ruby.tests#Structure": {
"type": "structure",
"members": {
"structure": {
"target": "smithy.ruby.tests#Structure"
}
}
}
}
}
17 changes: 17 additions & 0 deletions gems/smithy/spec/fixtures/recursive/model.smithy
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
$version: "2"

namespace smithy.ruby.tests

service Recursive {
version: "1.0.0"
operations: [Operation]
}

operation Operation {
input: Structure
output: Structure
}

structure Structure {
structure: Structure
}
13 changes: 13 additions & 0 deletions gems/smithy/spec/smithy/vise/service_index_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,19 @@ module Vise
actual = subject.shapes_for(service)
expect(actual.keys).to match_array(expected.keys)
end

context 'recursive structures' do
let(:fixture) do
JSON.load_file(File.expand_path('../../fixtures/recursive/model.json', __dir__))
end

it 'handles recursive shapes' do
service =
fixture['shapes']
.select { |id, _| id == 'smithy.ruby.tests#Recursive' }
subject.shapes_for(service)
end
end
end
end
end
Expand Down
Loading