Change preprocessModel to take Model instead of PluginContext

Author: gosar

smithy-typescript-codegen/src/main/java/software/amazon/smithy/typescript/codegen/CodegenVisitor.java

@@ -50,6 +50,7 @@
 import software.amazon.smithy.model.shapes.UnionShape;
 import software.amazon.smithy.model.traits.EnumTrait;
 import software.amazon.smithy.model.traits.PaginatedTrait;
+import software.amazon.smithy.model.transform.ModelTransformer;
 import software.amazon.smithy.model.validation.ValidationEvent;
 import software.amazon.smithy.typescript.codegen.TypeScriptSettings.ArtifactType;
 import software.amazon.smithy.typescript.codegen.integration.ProtocolGenerator;
@@ -108,18 +109,14 @@ class CodegenVisitor extends ShapeVisitor.Default<Void> {
         integrations.sort(Comparator.comparingInt(TypeScriptIntegration::getOrder));
 
         // Preprocess model using integrations.
-        TypeScriptSettings typescriptSettings = TypeScriptSettings.from(
-                context.getModel(), context.getSettings(), artifactType);
+        settings = TypeScriptSettings.from(context.getModel(), context.getSettings(), artifactType);
+        Model modifiedModel = context.getModel();
         for (TypeScriptIntegration integration : integrations) {
-            Model modifiedModel = integration.preprocessModel(context, typescriptSettings);
-            if (modifiedModel != context.getModel()) {
-                context = context.toBuilder().model(modifiedModel).build();
-                typescriptSettings = TypeScriptSettings.from(modifiedModel, context.getSettings(), artifactType);
-            }
+            modifiedModel = integration.preprocessModel(modifiedModel, settings);
         }
-        settings = typescriptSettings;
-        model = context.getModel();
-        nonTraits = context.getModelWithoutTraitShapes();
+        model = modifiedModel;
+        nonTraits = ModelTransformer.create().getModelWithoutTraitShapes(model);
+
         service = settings.getService(model);
 
         if (settings.getArtifactType().equals(ArtifactType.SSDK))  {

smithy-typescript-codegen/src/main/java/software/amazon/smithy/typescript/codegen/integration/TypeScriptIntegration.java

@@ -20,7 +20,6 @@
 import java.util.Map;
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;
-import software.amazon.smithy.build.PluginContext;
 import software.amazon.smithy.codegen.core.Symbol;
 import software.amazon.smithy.codegen.core.SymbolDependency;
 import software.amazon.smithy.codegen.core.SymbolProvider;
@@ -61,12 +60,12 @@ default byte getOrder() {
      * <p>This can be used to remove unsupported features, remove traits
      * from shapes (e.g., make members optional), etc.
      *
-     * @param context Plugin context.
+     * @param model Model being generated.
      * @param settings Setting used to generate.
      * @return Returns the updated model.
      */
-    default Model preprocessModel(PluginContext context, TypeScriptSettings settings) {
-        return context.getModel();
+    default Model preprocessModel(Model model, TypeScriptSettings settings) {
+        return model;
     }
 
     /**