Unverified Commit 53aaf965 authored by Harry Barber's avatar Harry Barber Committed by GitHub
Browse files

Enforce downwards walker traversal (#2164) 

* Enforce downwards walker traversal

* Use DirectedWalker
parent 81f435be

codegen-client/src/main/kotlin/software/amazon/smithy/rust/codegen/client/smithy/ClientCodegenVisitor.kt

+2 −2
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@ package software.amazon.smithy.rust.codegen.client.smithy 
import software.amazon.smithy.build.PluginContext

import software.amazon.smithy.model.Model

import software.amazon.smithy.model.knowledge.NullableIndex

import software.amazon.smithy.model.neighbor.Walker

import software.amazon.smithy.model.shapes.OperationShape

import software.amazon.smithy.model.shapes.ServiceShape

import software.amazon.smithy.model.shapes.Shape
@@ -25,6 +24,7 @@ import software.amazon.smithy.rust.codegen.client.smithy.protocols.ClientProtoco 
import software.amazon.smithy.rust.codegen.client.smithy.transformers.AddErrorMessage

import software.amazon.smithy.rust.codegen.client.smithy.transformers.RemoveEventStreamOperations

import software.amazon.smithy.rust.codegen.core.rustlang.RustModule

import software.amazon.smithy.rust.codegen.core.smithy.DirectedWalker

import software.amazon.smithy.rust.codegen.core.smithy.RustCrate

import software.amazon.smithy.rust.codegen.core.smithy.RustSymbolProvider

import software.amazon.smithy.rust.codegen.core.smithy.SymbolVisitorConfig
@@ -132,7 +132,7 @@ class ClientCodegenVisitor( 
    fun execute() {

        logger.info("generating Rust client...")

        val service = settings.getService(model)

        val serviceShapes = Walker(model).walkShapes(service)

        val serviceShapes = DirectedWalker(model).walkShapes(service)

        serviceShapes.forEach { it.accept(this) }

        codegenDecorator.extras(codegenContext, rustCrate)

        // finalize actually writes files into the base directory, renders any inline functions that were used, and

codegen-core/src/main/kotlin/software/amazon/smithy/rust/codegen/core/smithy/DirectedWalker.kt

0 → 100644
+29 −0
Original line number Diff line number Diff line 
/*

 * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.

 * SPDX-License-Identifier: Apache-2.0

 */



package software.amazon.smithy.rust.codegen.core.smithy



import software.amazon.smithy.model.Model

import software.amazon.smithy.model.neighbor.Relationship

import software.amazon.smithy.model.neighbor.RelationshipDirection

import software.amazon.smithy.model.neighbor.Walker

import software.amazon.smithy.model.shapes.Shape

import java.util.function.Predicate



/**

 * A walker which traverses down the Shape graph. This is in contrast to `Walker` which can traverse up the shape

 * graph.

 */

class DirectedWalker(model: Model) {

    private val inner = Walker(model)



    fun walkShapes(shape: Shape): Set<Shape> {

        return walkShapes(shape) { _ -> true }

    }



    fun walkShapes(shape: Shape, predicate: Predicate<Relationship>): Set<Shape> {

        return inner.walkShapes(shape) { rel -> predicate.test(rel) && rel.direction == RelationshipDirection.DIRECTED }

    }

}

codegen-core/src/main/kotlin/software/amazon/smithy/rust/codegen/core/smithy/transformers/EventStreamNormalizer.kt

+3 −2
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ package software.amazon.smithy.rust.codegen.core.smithy.transformers 


import software.amazon.smithy.model.Model

import software.amazon.smithy.model.knowledge.OperationIndex

import software.amazon.smithy.model.neighbor.Walker

import software.amazon.smithy.model.shapes.OperationShape

import software.amazon.smithy.model.shapes.Shape

import software.amazon.smithy.model.shapes.ShapeId
@@ -15,6 +14,7 @@ import software.amazon.smithy.model.shapes.StructureShape 
import software.amazon.smithy.model.shapes.UnionShape

import software.amazon.smithy.model.traits.ErrorTrait

import software.amazon.smithy.model.transform.ModelTransformer

import software.amazon.smithy.rust.codegen.core.smithy.DirectedWalker

import software.amazon.smithy.rust.codegen.core.smithy.traits.SyntheticEventStreamUnionTrait

import software.amazon.smithy.rust.codegen.core.util.expectTrait

import software.amazon.smithy.rust.codegen.core.util.hasTrait
@@ -74,7 +74,8 @@ fun OperationShape.operationErrors(model: Model): List<Shape> { 
}



fun eventStreamErrors(model: Model, shape: Shape): Map<UnionShape, List<StructureShape>> {

    return Walker(model).walkShapes(shape)

    return DirectedWalker(model)

        .walkShapes(shape)

        .filter { it is UnionShape && it.isEventStream() }

        .map { it.asUnionShape().get() }

        .associateWith { unionShape ->

codegen-server/python/src/main/kotlin/software/amazon/smithy/rust/codegen/server/python/smithy/customizations/PythonServerCodegenDecorator.kt

+2 −2
Original line number Diff line number Diff line
@@ -6,12 +6,12 @@ 
package software.amazon.smithy.rust.codegen.server.python.smithy.customizations



import com.moandjiezana.toml.TomlWriter

import software.amazon.smithy.model.neighbor.Walker

import software.amazon.smithy.rust.codegen.core.rustlang.Writable

import software.amazon.smithy.rust.codegen.core.rustlang.docs

import software.amazon.smithy.rust.codegen.core.rustlang.rust

import software.amazon.smithy.rust.codegen.core.rustlang.rustBlock

import software.amazon.smithy.rust.codegen.core.rustlang.writable

import software.amazon.smithy.rust.codegen.core.smithy.DirectedWalker

import software.amazon.smithy.rust.codegen.core.smithy.RustCrate

import software.amazon.smithy.rust.codegen.core.smithy.generators.LibRsCustomization

import software.amazon.smithy.rust.codegen.core.smithy.generators.LibRsSection
@@ -73,7 +73,7 @@ class PythonExportModuleDecorator : ServerCodegenDecorator { 


    override fun extras(codegenContext: ServerCodegenContext, rustCrate: RustCrate) {

        val service = codegenContext.settings.getService(codegenContext.model)

        val serviceShapes = Walker(codegenContext.model).walkShapes(service)

        val serviceShapes = DirectedWalker(codegenContext.model).walkShapes(service)

        PythonServerModuleGenerator(codegenContext, rustCrate, serviceShapes).render()

    }

}

codegen-server/src/main/kotlin/software/amazon/smithy/rust/codegen/server/smithy/Constraints.kt

+2 −2
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ package software.amazon.smithy.rust.codegen.server.smithy 


import software.amazon.smithy.codegen.core.SymbolProvider

import software.amazon.smithy.model.Model

import software.amazon.smithy.model.neighbor.Walker

import software.amazon.smithy.model.shapes.BlobShape

import software.amazon.smithy.model.shapes.ByteShape

import software.amazon.smithy.model.shapes.CollectionShape
@@ -28,6 +27,7 @@ import software.amazon.smithy.model.traits.RangeTrait 
import software.amazon.smithy.model.traits.RequiredTrait

import software.amazon.smithy.model.traits.UniqueItemsTrait

import software.amazon.smithy.rust.codegen.core.smithy.CodegenContext

import software.amazon.smithy.rust.codegen.core.smithy.DirectedWalker

import software.amazon.smithy.rust.codegen.core.smithy.isOptional

import software.amazon.smithy.rust.codegen.core.util.UNREACHABLE

import software.amazon.smithy.rust.codegen.core.util.hasTrait
@@ -108,7 +108,7 @@ fun Shape.canReachConstrainedShape(model: Model, symbolProvider: SymbolProvider) 
        //  so we can't simply delegate to the `else` branch when we implement them.

        this.targetCanReachConstrainedShape(model, symbolProvider)

    } else {

        Walker(model).walkShapes(this).toSet().any { it.isDirectlyConstrained(symbolProvider) }

        DirectedWalker(model).walkShapes(this).toSet().any { it.isDirectlyConstrained(symbolProvider) }

    }



fun MemberShape.targetCanReachConstrainedShape(model: Model, symbolProvider: SymbolProvider): Boolean =