[WIP] Revamp schema compilation caching

CHANGELOG.md

@@ -24,6 +24,22 @@ Previously they'd be named after the **member target**, now they will use the na
 ## Made `EncoderK`'s second type parameter a type member in [#1519](https://github.com/disneystreaming/smithy4s/pull/1519)
 
 There's usually only one instance of `EncoderK[F, A]` for a particular `F[_]`, and interpreters don't need to know what `A` is. For convenience, the type parameter has been moved to a type member.
+# 0.18.26
+
+* Optimises the conversion of empty smithy4s.Blob to fs2.Stream, to avoid performance degradation in Ember (see [#1609](https://github.com/disneystreaming/smithy4s/pull/1609))
+* Adds utility types for working with endpoint handlers (see [#1612](https://github.com/disneystreaming/smithy4s/pull/1612))
+* Add a more informative error message for repeated namespaces (see [#1608](https://github.com/disneystreaming/smithy4s/pull/1608)).
+* Adds `com.disneystreaming.smithy4s:smithy4s-protocol` dependency to the generation of `smithy-build.json` in the `smithy4sUpdateLSPConfig` tasks of the codegen plugins (see [#1610](https://github.com/disneystreaming/smithy4s/pull/1610)).
+
+# 0.18.25
+
+* Add A flag to allow for numerics to be decoded from JSON strings (in smithy4s-json).
+* Fixes issues in which applications of some Smithy traits would be incorrectly rendered in Scala code (see [#1602](https://github.com/disneystreaming/smithy4s/pull/1602)).
+* Fixes an issue in which refinements wouldn't work on custom simple shapes (newtypes) (see [#1595](https://github.com/disneystreaming/smithy4s/pull/1595))
+* Fixes a regression from 0.18.4 which incorrectly rendered default values for certain types (see [#1593](https://github.com/disneystreaming/smithy4s/pull/1593))
+* Fixes an issue in which union members targetting Unit would fail to compile when used as traits (see [#1600](https://github.com/disneystreaming/smithy4s/pull/1600)).
+* Make the `transform` method in generated `*Gen` algebras final. This should make it possible to derive e.g. `FunctorK` instances in cats-tagless automatically (see [#1588](https://github.com/disneystreaming/smithy4s/pull/1588)).
+* Fixes commons.toKebabCase() sometimes drops the first letter (see [#1603](https://github.com/disneystreaming/smithy4s/pull/1603)).
 
 # 0.18.24
 

build.sbt

@@ -407,7 +407,9 @@ lazy val codegen = projectMatrix
       "smithyOrg" -> Dependencies.Smithy.org,
       "smithyVersion" -> Dependencies.Smithy.smithyVersion,
       "alloyOrg" -> Dependencies.Alloy.org,
-      "alloyVersion" -> Dependencies.Alloy.alloyVersion
+      "alloyVersion" -> Dependencies.Alloy.alloyVersion,
+      "smithy4sOrg" -> organization.value,
+      "protocolArtifactName" -> "smithy4s-protocol",
     ),
     buildInfoPackage := "smithy4s.codegen",
     libraryDependencies ++= Seq(
@@ -933,8 +935,8 @@ lazy val bootstrapped = projectMatrix
   .in(file("modules/bootstrapped"))
   .dependsOn(cats, `aws-kernel`, complianceTests)
   .disablePlugins(ScalafixPlugin)
-  .disablePlugins(HeaderPlugin)
   .settings(
+    Compile / headerSources := Nil,
     // Setting ScalaPB to generate Scala code from proto files generated by
     // smithy4s
     Compile / PB.generate := {
@@ -1299,7 +1301,7 @@ def genSmithyImpl(config: Configuration) = Def.task {
 
 addCommandAlias(
   "ci",
-  "versionDump; clean; scalafmtCheckAll; headerCheck; test; publishLocal; scripted"
+  "versionDump; clean; scalafmtCheckAll; headerCheckAll; test; publishLocal; scripted"
 )
 
 addCommandAlias(

flake.nix

@@ -7,10 +7,10 @@
       let
         pkgs = import nixpkgs { inherit system; };
         shellPackages = with pkgs; [
-          temurin-jre-bin-17
+          temurin-bin-17
           nodejs-18_x
           yarn
-          (pkgs.sbt.override { jre = pkgs.temurin-jre-bin-17; })
+          (pkgs.sbt.override { jre = pkgs.temurin-bin-17; })
         ];
         protobuf = pkgs.protobuf3_21;
       in

modules/bootstrapped/src/generated/com/amazonaws/dynamodb/DynamoDB.scala

@@ -49,7 +49,7 @@ trait DynamoDBGen[F[_, _, _, _, _]] {
     */
   def listTables(exclusiveStartTableName: Option[TableName] = None, limit: Option[ListTablesInputLimit] = None): F[ListTablesInput, DynamoDBOperation.ListTablesError, ListTablesOutput, Nothing, Nothing]
 
-  def transform: Transformation.PartiallyApplied[DynamoDBGen[F]] = Transformation.of[DynamoDBGen[F]](this)
+  final def transform: Transformation.PartiallyApplied[DynamoDBGen[F]] = Transformation.of[DynamoDBGen[F]](this)
 }
 
 object DynamoDBGen extends Service.Mixin[DynamoDBGen, DynamoDBOperation] {

modules/bootstrapped/src/generated/com/amazonaws/dynamodb/Endpoint.scala

@@ -28,6 +28,6 @@ object Endpoint extends ShapeTag.Companion[Endpoint] {
 
   implicit val schema: Schema[Endpoint] = struct(
     string.required[Endpoint]("Address", _.address).addHints(smithy.api.Documentation("<p>IP address of the endpoint.</p>")),
-    long.required[Endpoint]("CachePeriodInMinutes", _.cachePeriodInMinutes).addHints(smithy.api.Default(smithy4s.Document.fromDouble(0.0d)), smithy.api.Documentation("<p>Endpoint cache time to live (TTL) value.</p>")),
+    long.required[Endpoint]("CachePeriodInMinutes", _.cachePeriodInMinutes).addHints(smithy.api.Documentation("<p>Endpoint cache time to live (TTL) value.</p>"), smithy.api.Default(smithy4s.Document.fromDouble(0.0d))),
   )(make).withId(id).addHints(hints)
 }

modules/bootstrapped/src/generated/smithy4s/benchmark/BenchmarkService.scala

@@ -17,7 +17,7 @@ trait BenchmarkServiceGen[F[_, _, _, _, _]] {
   def createObject(key: String, bucketName: String, payload: S3Object): F[CreateObjectInput, Nothing, Unit, Nothing, Nothing]
   def sendString(key: String, bucketName: String, body: String): F[SendStringInput, Nothing, Unit, Nothing, Nothing]
 
-  def transform: Transformation.PartiallyApplied[BenchmarkServiceGen[F]] = Transformation.of[BenchmarkServiceGen[F]](this)
+  final def transform: Transformation.PartiallyApplied[BenchmarkServiceGen[F]] = Transformation.of[BenchmarkServiceGen[F]](this)
 }
 
 object BenchmarkServiceGen extends Service.Mixin[BenchmarkServiceGen, BenchmarkServiceOperation] {

modules/bootstrapped/src/generated/smithy4s/example/BrandService.scala

@@ -16,7 +16,7 @@ trait BrandServiceGen[F[_, _, _, _, _]] {
 
   def addBrands(brands: Option[List[String]] = None): F[AddBrandsInput, Nothing, Unit, Nothing, Nothing]
 
-  def transform: Transformation.PartiallyApplied[BrandServiceGen[F]] = Transformation.of[BrandServiceGen[F]](this)
+  final def transform: Transformation.PartiallyApplied[BrandServiceGen[F]] = Transformation.of[BrandServiceGen[F]](this)
 }
 
 object BrandServiceGen extends Service.Mixin[BrandServiceGen, BrandServiceOperation] {

modules/bootstrapped/src/generated/smithy4s/example/DefaultNotCapitalized.scala

@@ -0,0 +1,22 @@
+package smithy4s.example
+
+import smithy4s.Hints
+import smithy4s.Schema
+import smithy4s.ShapeId
+import smithy4s.ShapeTag
+import smithy4s.schema.Schema.struct
+
+final case class DefaultNotCapitalized(name: Username = smithy4s.example.Username("hello"))
+
+object DefaultNotCapitalized extends ShapeTag.Companion[DefaultNotCapitalized] {
+  val id: ShapeId = ShapeId("smithy4s.example", "DefaultNotCapitalized")
+
+  val hints: Hints = Hints.empty
+
+  // constructor using the original order from the spec
+  private def make(name: Username): DefaultNotCapitalized = DefaultNotCapitalized(name)
+
+  implicit val schema: Schema[DefaultNotCapitalized] = struct(
+    Username.schema.required[DefaultNotCapitalized]("name", _.name).addHints(smithy.api.Default(smithy4s.Document.fromString("hello"))),
+  )(make).withId(id).addHints(hints)
+}

modules/bootstrapped/src/generated/smithy4s/example/DefaultNullsOperationInput.scala

@@ -22,7 +22,7 @@ object DefaultNullsOperationInput extends ShapeTag.Companion[DefaultNullsOperati
   implicit val schema: Schema[DefaultNullsOperationInput] = struct(
     string.optional[DefaultNullsOperationInput]("optional", _.optional),
     string.field[DefaultNullsOperationInput]("optionalWithDefault", _.optionalWithDefault).addHints(smithy.api.Default(smithy4s.Document.fromString("optional-default"))),
-    string.required[DefaultNullsOperationInput]("requiredLabel", _.requiredLabel).addHints(smithy.api.Default(smithy4s.Document.fromString("required-label-with-default")), smithy.api.HttpLabel()),
+    string.required[DefaultNullsOperationInput]("requiredLabel", _.requiredLabel).addHints(smithy.api.HttpLabel(), smithy.api.Default(smithy4s.Document.fromString("required-label-with-default"))),
     string.required[DefaultNullsOperationInput]("requiredWithDefault", _.requiredWithDefault).addHints(smithy.api.Default(smithy4s.Document.fromString("required-default"))),
     string.optional[DefaultNullsOperationInput]("optionalHeader", _.optionalHeader).addHints(smithy.api.HttpHeader("optional-header")),
     string.field[DefaultNullsOperationInput]("optionalHeaderWithDefault", _.optionalHeaderWithDefault).addHints(smithy.api.Default(smithy4s.Document.fromString("optional-header-with-default")), smithy.api.HttpHeader("optional-header-with-default")),

modules/bootstrapped/src/generated/smithy4s/example/DeprecatedService.scala

@@ -18,7 +18,7 @@ trait DeprecatedServiceGen[F[_, _, _, _, _]] {
   @deprecated(message = "N/A", since = "N/A")
   def deprecatedOperation(): F[Unit, Nothing, Unit, Nothing, Nothing]
 
-  def transform: Transformation.PartiallyApplied[DeprecatedServiceGen[F]] = Transformation.of[DeprecatedServiceGen[F]](this)
+  final def transform: Transformation.PartiallyApplied[DeprecatedServiceGen[F]] = Transformation.of[DeprecatedServiceGen[F]](this)
 }
 
 object DeprecatedServiceGen extends Service.Mixin[DeprecatedServiceGen, DeprecatedServiceOperation] {

modules/bootstrapped/src/generated/smithy4s/example/DeprecatedUnion.scala

@@ -51,15 +51,15 @@ object DeprecatedUnion extends ShapeTag.Companion[DeprecatedUnion] {
     def $ordinal: Int = 2
   }
 
-  object DeprecatedUnionProductCase extends ShapeTag.Companion[DeprecatedUnionProductCase] {
+  object DeprecatedUnionProductCase {
     val id: ShapeId = ShapeId("smithy4s.example", "DeprecatedUnionProductCase")
 
     val hints: Hints = Hints(
       smithy.api.Deprecated(message = None, since = None),
     ).lazily
 
 
-    implicit val schema: Schema[DeprecatedUnionProductCase] = constant(DeprecatedUnionProductCase()).withId(id).addHints(hints)
+    val schema: Schema[DeprecatedUnionProductCase] = constant(DeprecatedUnionProductCase()).withId(id).addHints(hints)
 
     val alt = schema.oneOf[DeprecatedUnion]("p")
   }
@@ -68,15 +68,15 @@ object DeprecatedUnion extends ShapeTag.Companion[DeprecatedUnion] {
     def $ordinal: Int = 3
   }
 
-  object UnionProductCaseDeprecatedAtCallSite extends ShapeTag.Companion[UnionProductCaseDeprecatedAtCallSite] {
+  object UnionProductCaseDeprecatedAtCallSite {
     val id: ShapeId = ShapeId("smithy4s.example", "UnionProductCaseDeprecatedAtCallSite")
 
     val hints: Hints = Hints(
       smithy.api.Deprecated(message = None, since = None),
     ).lazily
 
 
-    implicit val schema: Schema[UnionProductCaseDeprecatedAtCallSite] = constant(UnionProductCaseDeprecatedAtCallSite()).withId(id).addHints(hints)
+    val schema: Schema[UnionProductCaseDeprecatedAtCallSite] = constant(UnionProductCaseDeprecatedAtCallSite()).withId(id).addHints(hints)
 
     val alt = schema.oneOf[DeprecatedUnion]("p2")
   }

modules/bootstrapped/src/generated/smithy4s/example/DiscriminatedService.scala

@@ -15,7 +15,7 @@ trait DiscriminatedServiceGen[F[_, _, _, _, _]] {
 
   def testDiscriminated(key: String): F[TestDiscriminatedInput, Nothing, TestDiscriminatedOutput, Nothing, Nothing]
 
-  def transform: Transformation.PartiallyApplied[DiscriminatedServiceGen[F]] = Transformation.of[DiscriminatedServiceGen[F]](this)
+  final def transform: Transformation.PartiallyApplied[DiscriminatedServiceGen[F]] = Transformation.of[DiscriminatedServiceGen[F]](this)
 }
 
 object DiscriminatedServiceGen extends Service.Mixin[DiscriminatedServiceGen, DiscriminatedServiceOperation] {

modules/bootstrapped/src/generated/smithy4s/example/DummyService.scala

@@ -22,7 +22,7 @@ trait DummyServiceGen[F[_, _, _, _, _]] {
   def dummyHostPrefix(label1: String, label2: String, label3: HostLabelEnum): F[HostLabelInput, Nothing, Unit, Nothing, Nothing]
   def dummyPath(str: String, int: Int, ts1: Timestamp, ts2: Timestamp, ts3: Timestamp, ts4: Timestamp, b: Boolean, ie: Numbers): F[PathParams, Nothing, Unit, Nothing, Nothing]
 
-  def transform: Transformation.PartiallyApplied[DummyServiceGen[F]] = Transformation.of[DummyServiceGen[F]](this)
+  final def transform: Transformation.PartiallyApplied[DummyServiceGen[F]] = Transformation.of[DummyServiceGen[F]](this)
 }
 
 object DummyServiceGen extends Service.Mixin[DummyServiceGen, DummyServiceOperation] {

modules/bootstrapped/src/generated/smithy4s/example/EmptyService.scala

@@ -12,7 +12,7 @@ trait EmptyServiceGen[F[_, _, _, _, _]] {
   self =>
 
 
-  def transform: Transformation.PartiallyApplied[EmptyServiceGen[F]] = Transformation.of[EmptyServiceGen[F]](this)
+  final def transform: Transformation.PartiallyApplied[EmptyServiceGen[F]] = Transformation.of[EmptyServiceGen[F]](this)
 }
 
 object EmptyServiceGen extends Service.Mixin[EmptyServiceGen, EmptyServiceOperation] {

modules/bootstrapped/src/generated/smithy4s/example/ErrorHandlingService.scala

@@ -18,7 +18,7 @@ trait ErrorHandlingServiceGen[F[_, _, _, _, _]] {
 
   def errorHandlingOperation(in: Option[String] = None): F[ErrorHandlingOperationInput, ErrorHandlingServiceOperation.ErrorHandlingOperationError, ErrorHandlingOperationOutput, Nothing, Nothing]
 
-  def transform: Transformation.PartiallyApplied[ErrorHandlingServiceGen[F]] = Transformation.of[ErrorHandlingServiceGen[F]](this)
+  final def transform: Transformation.PartiallyApplied[ErrorHandlingServiceGen[F]] = Transformation.of[ErrorHandlingServiceGen[F]](this)
 }
 
 object ErrorHandlingServiceGen extends Service.Mixin[ErrorHandlingServiceGen, ErrorHandlingServiceOperation] {

modules/bootstrapped/src/generated/smithy4s/example/ErrorHandlingServiceExtraErrors.scala

@@ -19,7 +19,7 @@ trait ErrorHandlingServiceExtraErrorsGen[F[_, _, _, _, _]] {
 
   def extraErrorOperation(in: Option[String] = None): F[ExtraErrorOperationInput, ErrorHandlingServiceExtraErrorsOperation.ExtraErrorOperationError, Unit, Nothing, Nothing]
 
-  def transform: Transformation.PartiallyApplied[ErrorHandlingServiceExtraErrorsGen[F]] = Transformation.of[ErrorHandlingServiceExtraErrorsGen[F]](this)
+  final def transform: Transformation.PartiallyApplied[ErrorHandlingServiceExtraErrorsGen[F]] = Transformation.of[ErrorHandlingServiceExtraErrorsGen[F]](this)
 }
 
 object ErrorHandlingServiceExtraErrorsGen extends Service.Mixin[ErrorHandlingServiceExtraErrorsGen, ErrorHandlingServiceExtraErrorsOperation] {

modules/bootstrapped/src/generated/smithy4s/example/FooService.scala

@@ -23,7 +23,7 @@ trait FooServiceGen[F[_, _, _, _, _]] {
     */
   def getFoo(): F[Unit, Nothing, GetFooOutput, Nothing, Nothing]
 
-  def transform: Transformation.PartiallyApplied[FooServiceGen[F]] = Transformation.of[FooServiceGen[F]](this)
+  final def transform: Transformation.PartiallyApplied[FooServiceGen[F]] = Transformation.of[FooServiceGen[F]](this)
 }
 
 object FooServiceGen extends Service.Mixin[FooServiceGen, FooServiceOperation] {

modules/bootstrapped/src/generated/smithy4s/example/HasConstrainedNewtypes.scala

@@ -0,0 +1,26 @@
+package smithy4s.example
+
+import smithy4s.Hints
+import smithy4s.Schema
+import smithy4s.ShapeId
+import smithy4s.ShapeTag
+import smithy4s.schema.Schema.struct
+
+final case class HasConstrainedNewtypes(a: BucketName, b: CityId, c: Option[ObjectSize] = None, d: Option[IndexedSeq[String]] = None, e: Option[PNG] = None)
+
+object HasConstrainedNewtypes extends ShapeTag.Companion[HasConstrainedNewtypes] {
+  val id: ShapeId = ShapeId("smithy4s.example", "HasConstrainedNewtypes")
+
+  val hints: Hints = Hints.empty
+
+  // constructor using the original order from the spec
+  private def make(a: BucketName, b: CityId, c: Option[ObjectSize], d: Option[IndexedSeq[String]], e: Option[PNG]): HasConstrainedNewtypes = HasConstrainedNewtypes(a, b, c, d, e)
+
+  implicit val schema: Schema[HasConstrainedNewtypes] = struct(
+    BucketName.schema.validated(smithy.api.Length(min = Some(1L), max = None)).required[HasConstrainedNewtypes]("a", _.a),
+    CityId.schema.validated(smithy.api.Length(min = Some(1L), max = None)).required[HasConstrainedNewtypes]("b", _.b),
+    ObjectSize.schema.validated(smithy.api.Range(min = Some(scala.math.BigDecimal(1.0)), max = None)).optional[HasConstrainedNewtypes]("c", _.c),
+    SomeIndexSeq.underlyingSchema.validated(smithy.api.Length(min = Some(1L), max = None)).optional[HasConstrainedNewtypes]("d", _.d),
+    PNG.schema.validated(smithy.api.Length(min = Some(1L), max = None)).optional[HasConstrainedNewtypes]("e", _.e),
+  )(make).withId(id).addHints(hints)
+}

modules/bootstrapped/src/generated/smithy4s/example/HasUnionUnitCaseTrait.scala

@@ -0,0 +1,17 @@
+package smithy4s.example
+
+import smithy4s.Hints
+import smithy4s.Newtype
+import smithy4s.Schema
+import smithy4s.ShapeId
+import smithy4s.schema.Schema.bijection
+import smithy4s.schema.Schema.string
+
+object HasUnionUnitCaseTrait extends Newtype[String] {
+  val id: ShapeId = ShapeId("smithy4s.example", "HasUnionUnitCaseTrait")
+  val hints: Hints = Hints(
+    smithy4s.example.UnionTraitWithUnitCase.UCase.widen,
+  ).lazily
+  val underlyingSchema: Schema[String] = string.withId(id).addHints(hints)
+  implicit val schema: Schema[HasUnionUnitCaseTrait] = bijection(underlyingSchema, asBijection)
+}

modules/bootstrapped/src/generated/smithy4s/example/KVStore.scala

@@ -21,7 +21,7 @@ trait KVStoreGen[F[_, _, _, _, _]] {
   def put(key: String, value: String): F[KeyValue, KVStoreOperation.PutError, Unit, Nothing, Nothing]
   def delete(key: String): F[Key, KVStoreOperation.DeleteError, Unit, Nothing, Nothing]
 
-  def transform: Transformation.PartiallyApplied[KVStoreGen[F]] = Transformation.of[KVStoreGen[F]](this)
+  final def transform: Transformation.PartiallyApplied[KVStoreGen[F]] = Transformation.of[KVStoreGen[F]](this)
 }
 
 object KVStoreGen extends Service.Mixin[KVStoreGen, KVStoreOperation] {

modules/bootstrapped/src/generated/smithy4s/example/Library.scala

@@ -18,7 +18,7 @@ trait LibraryGen[F[_, _, _, _, _]] {
   def getBook(): F[Unit, Nothing, Unit, Nothing, Nothing]
   def buyBook(): F[Unit, Nothing, Unit, Nothing, Nothing]
 
-  def transform: Transformation.PartiallyApplied[LibraryGen[F]] = Transformation.of[LibraryGen[F]](this)
+  final def transform: Transformation.PartiallyApplied[LibraryGen[F]] = Transformation.of[LibraryGen[F]](this)
 }
 
 object LibraryGen extends Service.Mixin[LibraryGen, LibraryOperation] {

modules/bootstrapped/src/generated/smithy4s/example/NameCollision.scala

@@ -19,7 +19,7 @@ trait NameCollisionGen[F[_, _, _, _, _]] {
   def myOp(): F[Unit, NameCollisionOperation.MyOpError, Unit, Nothing, Nothing]
   def endpoint(): F[Unit, Nothing, Unit, Nothing, Nothing]
 
-  def transform: Transformation.PartiallyApplied[NameCollisionGen[F]] = Transformation.of[NameCollisionGen[F]](this)
+  final def transform: Transformation.PartiallyApplied[NameCollisionGen[F]] = Transformation.of[NameCollisionGen[F]](this)
 }
 
 object NameCollisionGen extends Service.Mixin[NameCollisionGen, NameCollisionOperation] {

modules/bootstrapped/src/generated/smithy4s/example/ObjectCollision.scala

@@ -24,7 +24,7 @@ trait ObjectCollisionGen[F[_, _, _, _, _]] {
   def _toString(): F[Unit, Nothing, Unit, Nothing, Nothing]
   def _wait(): F[Unit, Nothing, Unit, Nothing, Nothing]
 
-  def transform: Transformation.PartiallyApplied[ObjectCollisionGen[F]] = Transformation.of[ObjectCollisionGen[F]](this)
+  final def transform: Transformation.PartiallyApplied[ObjectCollisionGen[F]] = Transformation.of[ObjectCollisionGen[F]](this)
 }
 
 object ObjectCollisionGen extends Service.Mixin[ObjectCollisionGen, ObjectCollisionOperation] {

modules/bootstrapped/src/generated/smithy4s/example/ObjectService.scala

@@ -27,7 +27,7 @@ trait ObjectServiceGen[F[_, _, _, _, _]] {
     */
   def getObject(key: ObjectKey, bucketName: BucketName): F[GetObjectInput, ObjectServiceOperation.GetObjectError, GetObjectOutput, Nothing, Nothing]
 
-  def transform: Transformation.PartiallyApplied[ObjectServiceGen[F]] = Transformation.of[ObjectServiceGen[F]](this)
+  final def transform: Transformation.PartiallyApplied[ObjectServiceGen[F]] = Transformation.of[ObjectServiceGen[F]](this)
 }
 
 object ObjectServiceGen extends Service.Mixin[ObjectServiceGen, ObjectServiceOperation] {

modules/bootstrapped/src/generated/smithy4s/example/OrderType.scala

@@ -48,7 +48,7 @@ object OrderType extends ShapeTag.Companion[OrderType] {
     def $ordinal: Int = 1
   }
 
-  object InStoreOrder extends ShapeTag.Companion[InStoreOrder] {
+  object InStoreOrder {
     val id: ShapeId = ShapeId("smithy4s.example", "InStoreOrder")
 
     val hints: Hints = Hints(

modules/bootstrapped/src/generated/smithy4s/example/PackedInputsService.scala

@@ -16,7 +16,7 @@ trait PackedInputsServiceGen[F[_, _, _, _, _]] {
 
   def packedInputOperation(input: PackedInput): F[PackedInput, Nothing, Unit, Nothing, Nothing]
 
-  def transform: Transformation.PartiallyApplied[PackedInputsServiceGen[F]] = Transformation.of[PackedInputsServiceGen[F]](this)
+  final def transform: Transformation.PartiallyApplied[PackedInputsServiceGen[F]] = Transformation.of[PackedInputsServiceGen[F]](this)
 }
 
 object PackedInputsServiceGen extends Service.Mixin[PackedInputsServiceGen, PackedInputsServiceOperation] {

modules/bootstrapped/src/generated/smithy4s/example/PersonUnion.scala

@@ -32,7 +32,7 @@ object PersonUnion extends ShapeTag.Companion[PersonUnion] {
     def $ordinal: Int = 0
   }
 
-  object OtherPerson extends ShapeTag.Companion[OtherPerson] {
+  object OtherPerson {
     val id: ShapeId = ShapeId("smithy4s.example", "OtherPerson")
 
     val hints: Hints = Hints.empty