Add IoC framework integration for Spring and Jakarta CDI (#161)

- Add IocFramework enum with Spring and JakartaCdi variants
- Add iocFramework option to Options (default None)
- Generate @repository annotation on RepoImpl for Spring
- Generate @ApplicationScoped annotation on RepoImpl for Jakarta CDI
- Generate @Repository/@singleton annotations on TestInsert classes
- Add documentation page for IoC frameworks
- Add spring-context dependency for Doobie Scala 3 tester
- Add jakarta.enterprise.cdi-api dependency for Java tester

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-authored-by: Claude <noreply@anthropic.com>

Author: oyvindberg

bleep.yaml

@@ -107,6 +107,8 @@ projects:
       jvm213:
         sources: ./generated-and-checked-in-2.13
       jvm3:
+        dependencies:
+        - org.springframework:spring-context:6.1.6
         sources: ./generated-and-checked-in-3
     dependencies:
     - io.circe::circe-core:0.14.7
@@ -126,6 +128,7 @@ projects:
     - com.fasterxml.jackson.core:jackson-databind:2.17.2
     - com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.17.2
     - com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.17.2
+    - jakarta.enterprise:jakarta.enterprise.cdi-api:4.0.1
     dependsOn: typo-dsl-java
     isTestProject: true
     java:

site-in/other-features/ioc-frameworks.md

@@ -0,0 +1,108 @@
+---
+title: IoC Framework Integration
+---
+
+Typo can generate annotations for IoC (Inversion of Control) frameworks, making your repositories easy to inject with dependency injection.
+
+## Configuration
+
+Set the `iocFramework` option to enable annotation generation:
+
+```scala
+import typo.*
+
+// For Spring
+val options = Options(
+  pkg = "org.foo",
+  lang = LangScala(Dialect.Scala3, TypeSupportScala),
+  dbLib = Some(DbLibName.Doobie),
+  iocFramework = Some(IocFramework.Spring)
+)
+
+// For Jakarta CDI (Quarkus, WildFly, etc.)
+val javaOptions = Options(
+  pkg = "org.foo",
+  lang = LangJava,
+  dbLib = Some(DbLibName.Typo),
+  iocFramework = Some(IocFramework.JakartaCdi)
+)
+```
+
+## Supported Frameworks
+
+### Spring
+
+When `IocFramework.Spring` is configured, Typo adds:
+
+- `@Repository` annotation on `RepoImpl` classes (main scope)
+- `@Repository` annotation on `TestInsert` classes (test scope)
+
+**Generated code example:**
+
+```scala
+import org.springframework.stereotype.Repository
+
+@Repository
+class AddressRepoImpl extends AddressRepo {
+  // ...
+}
+```
+
+This enables automatic component scanning and dependency injection:
+
+```scala
+@Service
+class AddressService @Autowired() (addressRepo: AddressRepo) {
+  // addressRepo is automatically injected
+}
+```
+
+### Jakarta CDI (Quarkus)
+
+When `IocFramework.JakartaCdi` is configured, Typo adds:
+
+- `@ApplicationScoped` annotation on `RepoImpl` classes (main scope)
+- `@Singleton` annotation on `TestInsert` classes (test scope)
+
+**Generated code example:**
+
+```java
+import jakarta.enterprise.context.ApplicationScoped;
+
+@ApplicationScoped
+public class AddressRepoImpl implements AddressRepo {
+  // ...
+}
+```
+
+This enables CDI injection in Quarkus and other Jakarta EE environments:
+
+```java
+@ApplicationScoped
+public class AddressService {
+  @Inject
+  AddressRepo addressRepo;
+
+  // addressRepo is automatically injected
+}
+```
+
+## Dependencies
+
+You'll need to add the appropriate dependency to your project:
+
+**Spring:**
+```
+org.springframework:spring-context:6.1.x
+```
+
+**Jakarta CDI:**
+```
+jakarta.enterprise:jakarta.enterprise.cdi-api:4.0.x
+```
+
+## Notes
+
+- Mock repositories do not currently receive IoC annotations due to their constructor requirements
+- The annotations are only added when `iocFramework` is explicitly set (default is `None`)
+- Works with both Scala and Java code generation

site/sidebars.js

@@ -55,6 +55,7 @@ const sidebars = {
                 {type: "doc", id: "other-features/streaming-inserts"},
                 {type: "doc", id: "other-features/generate-into-multiple-projects"},
                 {type: "doc", id: "other-features/json"},
+                {type: "doc", id: "other-features/ioc-frameworks"},
                 {type: "doc", id: "other-features/faster-compilation"},
                 {type: "doc", id: "other-features/flexible"},
                 {type: "doc", id: "other-features/clickable-links"},

typo-scripts/src/scala/scripts/GeneratedAdventureWorks.scala

@@ -40,21 +40,21 @@ object GeneratedAdventureWorks {
           ),
           Duration.Inf
         )
-        val variants: Seq[(Lang, DbLibName, Option[JsonLibName], String, String)] = List(
-          (LangScala(Dialect.Scala2XSource3, TypeSupportScala), DbLibName.Anorm, Some(JsonLibName.PlayJson), "typo-tester-anorm", "-2.13"),
-          (LangScala(Dialect.Scala3, TypeSupportScala), DbLibName.Anorm, Some(JsonLibName.PlayJson), "typo-tester-anorm", "-3"),
-          (LangScala(Dialect.Scala2XSource3, TypeSupportScala), DbLibName.Doobie, Some(JsonLibName.Circe), "typo-tester-doobie", "-2.13"),
-          (LangScala(Dialect.Scala3, TypeSupportScala), DbLibName.Doobie, Some(JsonLibName.Circe), "typo-tester-doobie", "-3"),
-          (LangScala(Dialect.Scala2XSource3, TypeSupportScala), DbLibName.ZioJdbc, Some(JsonLibName.ZioJson), "typo-tester-zio-jdbc", "-2.13"),
-          (LangScala(Dialect.Scala3, TypeSupportScala), DbLibName.ZioJdbc, Some(JsonLibName.ZioJson), "typo-tester-zio-jdbc", "-3"),
-          (LangJava, DbLibName.Typo, Some(JsonLibName.Jackson), "typo-tester-typo-java", ""),
-          (LangScala(Dialect.Scala3, TypeSupportJava), DbLibName.Typo, None, "typo-tester-typo-scala", "")
+        val variants: Seq[(Lang, DbLibName, Option[JsonLibName], Option[IocFramework], String, String)] = List(
+          (LangScala(Dialect.Scala2XSource3, TypeSupportScala), DbLibName.Anorm, Some(JsonLibName.PlayJson), None, "typo-tester-anorm", "-2.13"),
+          (LangScala(Dialect.Scala3, TypeSupportScala), DbLibName.Anorm, Some(JsonLibName.PlayJson), None, "typo-tester-anorm", "-3"),
+          (LangScala(Dialect.Scala2XSource3, TypeSupportScala), DbLibName.Doobie, Some(JsonLibName.Circe), None, "typo-tester-doobie", "-2.13"),
+          (LangScala(Dialect.Scala3, TypeSupportScala), DbLibName.Doobie, Some(JsonLibName.Circe), Some(IocFramework.Spring), "typo-tester-doobie", "-3"),
+          (LangScala(Dialect.Scala2XSource3, TypeSupportScala), DbLibName.ZioJdbc, Some(JsonLibName.ZioJson), None, "typo-tester-zio-jdbc", "-2.13"),
+          (LangScala(Dialect.Scala3, TypeSupportScala), DbLibName.ZioJdbc, Some(JsonLibName.ZioJson), None, "typo-tester-zio-jdbc", "-3"),
+          (LangJava, DbLibName.Typo, Some(JsonLibName.Jackson), Some(IocFramework.JakartaCdi), "typo-tester-typo-java", ""),
+          (LangScala(Dialect.Scala3, TypeSupportJava), DbLibName.Typo, None, None, "typo-tester-typo-scala", "")
         )
 
         def go(): Unit = {
           val newSqlScripts = Await.result(readSqlFileDirectories(typoLogger, scriptsPath, ds), Duration.Inf)
 
-          variants.foreach { case (lang, dbLib, jsonLib, projectPath, suffix) =>
+          variants.foreach { case (lang, dbLib, jsonLib, iocFramework, projectPath, suffix) =>
             val options = Options(
               pkg = "adventureworks",
               lang = lang,
@@ -69,7 +69,8 @@ object GeneratedAdventureWorks {
               enablePrimaryKeyType = !Selector.relationNames("billofmaterials"),
               enableTestInserts = Selector.All,
               readonlyRepo = Selector.relationNames("purchaseorderdetail"),
-              enableDsl = true
+              enableDsl = true,
+              iocFramework = iocFramework
             )
             val targetSources = buildDir.resolve(s"$projectPath/generated-and-checked-in$suffix")
 

typo-tester-doobie/generated-and-checked-in-3/adventureworks/TestInsert.scala

@@ -328,8 +328,10 @@ import java.time.LocalDate
 import java.time.LocalDateTime
 import java.time.LocalTime
 import java.time.ZoneOffset
+import org.springframework.stereotype.Repository
 import scala.util.Random
 
+@Repository
 /** Methods to generate random data for `Ident(TestInsert)` */
 case class TestInsert(
   random: Random,

typo-tester-doobie/generated-and-checked-in-3/adventureworks/hr/d/DViewRepoImpl.scala

@@ -7,9 +7,11 @@ package adventureworks.hr.d
 
 import doobie.free.connection.ConnectionIO
 import fs2.Stream
+import org.springframework.stereotype.Repository
 import typo.dsl.SelectBuilder
 import doobie.syntax.string.toSqlInterpolator
 
+@Repository
 class DViewRepoImpl extends DViewRepo {
   def select: SelectBuilder[DViewFields, DViewRow] = SelectBuilder.of(""""hr"."d"""", DViewFields.structure, DViewRow.read)
 

typo-tester-doobie/generated-and-checked-in-3/adventureworks/hr/e/EViewRepoImpl.scala

@@ -7,9 +7,11 @@ package adventureworks.hr.e
 
 import doobie.free.connection.ConnectionIO
 import fs2.Stream
+import org.springframework.stereotype.Repository
 import typo.dsl.SelectBuilder
 import doobie.syntax.string.toSqlInterpolator
 
+@Repository
 class EViewRepoImpl extends EViewRepo {
   def select: SelectBuilder[EViewFields, EViewRow] = SelectBuilder.of(""""hr"."e"""", EViewFields.structure, EViewRow.read)
 

typo-tester-doobie/generated-and-checked-in-3/adventureworks/hr/edh/EdhViewRepoImpl.scala

@@ -7,9 +7,11 @@ package adventureworks.hr.edh
 
 import doobie.free.connection.ConnectionIO
 import fs2.Stream
+import org.springframework.stereotype.Repository
 import typo.dsl.SelectBuilder
 import doobie.syntax.string.toSqlInterpolator
 
+@Repository
 class EdhViewRepoImpl extends EdhViewRepo {
   def select: SelectBuilder[EdhViewFields, EdhViewRow] = SelectBuilder.of(""""hr"."edh"""", EdhViewFields.structure, EdhViewRow.read)
 

typo-tester-doobie/generated-and-checked-in-3/adventureworks/hr/eph/EphViewRepoImpl.scala

@@ -7,9 +7,11 @@ package adventureworks.hr.eph
 
 import doobie.free.connection.ConnectionIO
 import fs2.Stream
+import org.springframework.stereotype.Repository
 import typo.dsl.SelectBuilder
 import doobie.syntax.string.toSqlInterpolator
 
+@Repository
 class EphViewRepoImpl extends EphViewRepo {
   def select: SelectBuilder[EphViewFields, EphViewRow] = SelectBuilder.of(""""hr"."eph"""", EphViewFields.structure, EphViewRow.read)
 

typo-tester-doobie/generated-and-checked-in-3/adventureworks/hr/jc/JcViewRepoImpl.scala

@@ -7,9 +7,11 @@ package adventureworks.hr.jc
 
 import doobie.free.connection.ConnectionIO
 import fs2.Stream
+import org.springframework.stereotype.Repository
 import typo.dsl.SelectBuilder
 import doobie.syntax.string.toSqlInterpolator
 
+@Repository
 class JcViewRepoImpl extends JcViewRepo {
   def select: SelectBuilder[JcViewFields, JcViewRow] = SelectBuilder.of(""""hr"."jc"""", JcViewFields.structure, JcViewRow.read)