lint

.editorconfig

@@ -1,2 +1,4 @@
 [*.{kt,kts}]
-disabled_rules=no-wildcard-imports
+ktlint_code_style = ktlint_official
+ktlint_disabled_rules = no-wildcard-imports
+ij_kotlin_allow_trailing_comma_on_call_site = true

build.gradle.kts

@@ -60,8 +60,9 @@ tasks {
 
     val publish by creating {
         group = "publishing"
-        if (!isSnapshot)
+        if (!isSnapshot) {
             finalizedBy("closeAndReleaseSonatypeStagingRepository", ":docs:orchidDeploy", ":gradle-plugin:publishPlugins")
+        }
     }
 
     val version by creating {

docs/src/orchid/kotlin/com/intuit/hooks/docs/HooksTheme.kt

@@ -35,6 +35,6 @@ class HooksTheme @Inject constructor(context: OrchidContext) : Theme(context, "H
             listOfNotNull(super.getResourceSource(), delegateTheme.resourceSource),
             emptyList(),
             priority,
-            ThemeResourceSource
+            ThemeResourceSource,
         )
 }

example-library/src/test/kotlin/CarHooksTest.kt

@@ -1,7 +1,7 @@
 package com.intuit.hooks.example.library
 
 import com.intuit.hooks.example.library.car.Car
-import org.junit.jupiter.api.Assertions.*
+import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test
 
 internal class CarHooksTest {

example-library/src/test/kotlin/GenericHookTests.kt

@@ -1,6 +1,7 @@
 package com.intuit.hooks.example.library
 
-import com.intuit.hooks.BailResult.*
+import com.intuit.hooks.BailResult.Bail
+import com.intuit.hooks.BailResult.Continue
 import com.intuit.hooks.HookContext
 import com.intuit.hooks.LoopResult
 import com.intuit.hooks.example.library.generic.GenericHooksImpl
@@ -140,6 +141,7 @@ class GenericHookTests {
         val result = h.call("Kian")
         Assertions.assertEquals("bail now", result)
     }
+
     @Test
     fun `async series loop`() = runBlocking {
         var incrementedA = 0

gradle-plugin/src/main/kotlin/com/intuit/hooks/plugin/gradle/HooksGradlePlugin.kt

@@ -21,17 +21,18 @@ public class HooksGradlePlugin : Plugin<Project> {
 
     private fun Project.addDependency(configuration: String, dependencyNotation: String) = configurations
         .getByName(configuration).dependencies.add(
-            dependencies.create(dependencyNotation)
+            dependencies.create(dependencyNotation),
         )
 
     override fun apply(project: Project): Unit = with(project) {
         extensions.create(
             "hooks",
-            HooksGradleExtension::class.java
+            HooksGradleExtension::class.java,
         )
 
-        if (!pluginManager.hasPlugin("com.google.devtools.ksp"))
+        if (!pluginManager.hasPlugin("com.google.devtools.ksp")) {
             pluginManager.apply("com.google.devtools.ksp")
+        }
 
         addDependency("api", "com.intuit.hooks:hooks:$hooksVersion")
         addDependency("ksp", "com.intuit.hooks:processor:$hooksVersion")

gradle-plugin/src/test/kotlin/HooksGradlePluginTest.kt

@@ -33,15 +33,15 @@ class HooksGradlePluginTest {
                 kotlin("jvm")
                 id("com.intuit.hooks")
             }
-        """
+        """,
         )
     }
 
     @Test fun `can apply plugin`() {
         buildFile.appendKotlin(
             """
             hooks {}
-        """
+        """,
         )
 
         assertDoesNotThrow {
@@ -66,7 +66,7 @@ class HooksGradlePluginTest {
                 @Sync<(String) -> Unit>
                 abstract val testSyncHook: Hook
             }
-        """
+        """,
         )
 
         val runner = GradleRunner.create()

hooks/src/main/kotlin/com/intuit/hooks/BaseHook.kt

@@ -37,7 +37,7 @@ public data class TapInfo<FWithContext : Function<*>> internal constructor(
     public val name: String,
     public val id: String,
     public val type: String,
-    public val f: FWithContext,
+    public val f: FWithContext
     // val stage: Int, // todo: maybe this should be forEachIndexed?
     // before?: string | Array // todo: do we even really need this?
 )

hooks/src/main/kotlin/com/intuit/hooks/dsl/Hooks.kt

@@ -60,7 +60,8 @@ public abstract class Hooks {
         ReplaceWith("@Hooks.AsyncParallelBail<F>"),
         DeprecationLevel.ERROR,
     )
-    @ExperimentalCoroutinesApi protected fun <F : Function<BailResult<*>>> asyncParallelBailHook(): AsyncParallelBailHook<*, *> = stub()
+    @ExperimentalCoroutinesApi
+    protected fun <F : Function<BailResult<*>>> asyncParallelBailHook(): AsyncParallelBailHook<*, *> = stub()
 
     protected annotation class AsyncSeries<F : Function<*>>
 

hooks/src/test/kotlin/com/intuit/hooks/AsyncSeriesLoopHookTests.kt

@@ -1,6 +1,8 @@
 package com.intuit.hooks
 
-import io.mockk.*
+import io.mockk.coEvery
+import io.mockk.coVerify
+import io.mockk.mockk
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.runBlocking
 import org.junit.jupiter.api.Assertions
@@ -10,7 +12,7 @@ class AsyncSeriesLoopHookTests {
     class LoopHook1<T1> : AsyncSeriesLoopHook<suspend (HookContext, T1) -> LoopResult, suspend (HookContext, T1) -> Unit>() {
         suspend fun call(p1: T1) = super.call(
             invokeTap = { f, context -> f(context, p1) },
-            invokeInterceptor = { f, context -> f(context, p1) }
+            invokeInterceptor = { f, context -> f(context, p1) },
         )
     }
 

hooks/src/test/kotlin/com/intuit/hooks/AsyncSeriesWaterfallHookTests.kt

@@ -10,7 +10,7 @@ class AsyncSeriesWaterfallHookTests {
         suspend fun call(p1: R) = super.call(
             p1,
             invokeTap = { f, r, context -> f(context, r) },
-            invokeInterceptor = { f, context -> f(context, p1) }
+            invokeInterceptor = { f, context -> f(context, p1) },
         )
     }
 

hooks/src/test/kotlin/com/intuit/hooks/SyncLoopHookTests.kt

@@ -13,7 +13,7 @@ class SyncLoopHookTests {
     class LoopHook1<T1> : SyncLoopHook<(HookContext, T1) -> LoopResult, (HookContext, T1) -> Unit>() {
         fun call(p1: T1) = super.call(
             invokeTap = { f, context -> f(context, p1) },
-            invokeInterceptor = { f, context -> f(context, p1) }
+            invokeInterceptor = { f, context -> f(context, p1) },
         )
     }
 

hooks/src/test/kotlin/com/intuit/hooks/SyncWaterfallHookTests.kt

@@ -8,15 +8,15 @@ class SyncWaterfallHookTests {
         fun call(p1: T1) = super.call(
             p1,
             invokeTap = { f, acc, context -> f(context, acc) },
-            invokeInterceptor = { f, context -> f(context, p1) }
+            invokeInterceptor = { f, context -> f(context, p1) },
         )
     }
 
     class Hook2<T1, T2> : SyncWaterfallHook<(HookContext, T1, T2) -> T1, T1>() {
         fun call(p1: T1, p2: T2) = super.call(
             p1,
             invokeTap = { f, acc, context -> f(context, acc, p2) },
-            invokeInterceptor = { f, context -> f(context, p1, p2) }
+            invokeInterceptor = { f, context -> f(context, p1, p2) },
         )
     }
 

maven-plugin/build.gradle.kts

@@ -16,7 +16,7 @@ tasks {
         from(
             configurations.compileClasspath.get().filter { dependency ->
                 dependency.absolutePath.contains("kotlin-maven-symbol-processing")
-            }.map(::zipTree)
+            }.map(::zipTree),
         ) {
             this.duplicatesStrategy = DuplicatesStrategy.EXCLUDE
         }

processor/src/main/kotlin/com/intuit/hooks/plugin/Raise.kt

@@ -44,7 +44,7 @@ public inline fun <Error, A> Iterable<A>.accumulate(
     flatMap {
         recover({
             operation(it); emptyList()
-        }) { it }
+        },) { it }
     }.toNonEmptyListOrNull()?.let { raise(it) }
 }
 
@@ -62,7 +62,7 @@ public inline fun <Error, A, B> Iterable<A>.mapOrAccumulate( // TODO: Consider r
     @BuilderInference operation: Raise<Nel<Error>>.(A) -> B
 ): List<B> = recover({
     mapOrAccumulate(this@mapOrAccumulate) { operation(it) }
-}) { errors -> raise(errors.flatMap { it }) }
+},) { errors -> raise(errors.flatMap { it }) }
 
 /** [mapOrAccumulate] variant that accumulates errors from a validator that may raise multiple errors */
 context(Raise<NonEmptyList<Error>>)
@@ -71,7 +71,7 @@ public inline fun <Error, A, B> NonEmptyList<A>.mapOrAccumulate( // TODO: Consid
     @BuilderInference operation: Raise<Nel<Error>>.(A) -> B
 ): NonEmptyList<B> = recover({
     mapOrAccumulate(this@mapOrAccumulate) { operation(it) }
-}) { errors -> raise(errors.flatMap { it }) }
+},) { errors -> raise(errors.flatMap { it }) }
 
 /** [mapOrAccumulate] variant that accumulates errors from a validator that may raise multiple errors */
 context(Raise<NonEmptyList<Error>>)
@@ -80,4 +80,4 @@ public inline fun <Error, A, B> NonEmptySet<A>.mapOrAccumulate( // TODO: Conside
     @BuilderInference operation: Raise<Nel<Error>>.(A) -> B
 ): NonEmptySet<B> = recover({
     mapOrAccumulate(this@mapOrAccumulate) { operation(it) }
-}) { errors -> raise(errors.flatMap { it }) }
+},) { errors -> raise(errors.flatMap { it }) }

processor/src/main/kotlin/com/intuit/hooks/plugin/codegen/HookInfo.kt

@@ -14,8 +14,9 @@ internal data class HooksContainer(
     val superclass get() = originalClassName.let {
         if (typeArguments.isNotEmpty()) {
             it.parameterizedBy(typeArguments)
-        } else
+        } else {
             it
+        }
     }
 }
 
@@ -24,7 +25,7 @@ internal data class HookSignature(
     val isSuspend: Boolean,
     val returnType: TypeName,
     val returnTypeType: TypeName?,
-    val hookFunctionSignatureType: TypeName,
+    val hookFunctionSignatureType: TypeName
 ) {
     val nullableReturnTypeType: TypeName get() {
         requireNotNull(returnTypeType)
@@ -36,7 +37,7 @@ internal data class HookSignature(
 internal class HookParameter(
     val name: String?,
     val type: TypeName,
-    val position: Int,
+    val position: Int
 ) {
     val withType get() = "$withoutType: $type"
     val withoutType get() = name ?: "p$position"

processor/src/main/kotlin/com/intuit/hooks/plugin/codegen/Poet.kt

@@ -44,8 +44,9 @@ internal fun HookInfo.generateClass(): TypeSpec {
     val callBuilder = FunSpec.builder("call")
         .addParameters(parameterSpecs)
         .apply {
-            if (this@generateClass.isAsync)
+            if (this@generateClass.isAsync) {
                 addModifiers(KModifier.SUSPEND)
+            }
         }
 
     val (superclass, call) = when (hookType) {
@@ -66,7 +67,7 @@ internal fun HookInfo.generateClass(): TypeSpec {
                 .addCode(
                     "return super.call(invokeTap = %L, invokeInterceptor = %L)",
                     CodeBlock.of("{ f, context -> f(context, $paramsWithoutTypes) }"),
-                    CodeBlock.of("{ f, context -> f(context, $paramsWithoutTypes) }")
+                    CodeBlock.of("{ f, context -> f(context, $paramsWithoutTypes) }"),
                 )
 
             Pair(superclass, call)
@@ -81,7 +82,7 @@ internal fun HookInfo.generateClass(): TypeSpec {
                     "return super.call(%N, invokeTap = %L, invokeInterceptor = %L)",
                     accumulatorName,
                     CodeBlock.of("{ f, %N, context -> f(context, $paramsWithoutTypes) }", accumulatorName),
-                    CodeBlock.of("{ f, context -> f(context, $paramsWithoutTypes) }")
+                    CodeBlock.of("{ f, context -> f(context, $paramsWithoutTypes) }"),
                 )
 
             Pair(superclass, call)
@@ -127,7 +128,7 @@ private val HookInfo.lambdaTypeName get() = createHookContextLambda(hookSignatur
 private fun HookInfo.createHookContextLambda(returnType: TypeName): LambdaTypeName {
     val get = LambdaTypeName.get(
         parameters = listOf(ParameterSpec.unnamed(hookContext)) + parameterSpecs,
-        returnType = returnType
+        returnType = returnType,
     )
 
     return if (this.isAsync) get.copy(suspending = true) else get

processor/src/main/kotlin/com/intuit/hooks/plugin/ksp/HooksProcessor.kt

@@ -56,7 +56,7 @@ public class HooksProcessor(
             }, { throwable: Throwable ->
                 logger.error("Uncaught exception while processing file: ${throwable.localizedMessage}", file)
                 logger.exception(throwable)
-            })
+            },)
         }
     }
 
@@ -107,7 +107,7 @@ public class HooksProcessor(
                 typeSpecKind,
                 visibilityModifier,
                 typeArguments,
-                hooks
+                hooks,
             )
         }
     }

processor/src/main/kotlin/com/intuit/hooks/plugin/ksp/Text.kt

@@ -9,8 +9,11 @@ internal val KSTypeArgument.text: String get() = when (variance) {
     else -> "${variance.label} ${type!!.text}"
 }
 
-internal val List<KSTypeArgument>.text: String get() = if (isEmpty()) "" else
+internal val List<KSTypeArgument>.text: String get() = if (isEmpty()) {
+    ""
+} else {
     "<${joinToString(transform = KSTypeArgument::text)}>"
+}
 
 internal val KSTypeReference.text: String get() = element?.let {
     when (it) {

processor/src/main/kotlin/com/intuit/hooks/plugin/ksp/validation/AnnotationValidations.kt

@@ -64,7 +64,7 @@ internal fun KSPropertyDeclaration.validateHookAnnotation(parentResolver: TypePa
         { annotation.mustBeHookType(parentResolver) },
         { annotation.validateParameters(parentResolver) },
         { getVisibility().toKModifier() ?: KModifier.PUBLIC },
-        ::HookInfo
+        ::HookInfo,
     )
 }
 
@@ -106,7 +106,7 @@ private fun HookAnnotation.mustBeHookType(parentResolver: TypeParameterResolver)
         isSuspend,
         returnType,
         returnTypeType,
-        hookFunctionSignatureType
+        hookFunctionSignatureType,
     )
 } catch (exception: Exception) {
     raise(HookValidationError.MustBeHookTypeSignature(this))

processor/src/main/kotlin/com/intuit/hooks/plugin/ksp/validation/HookPropertyValidations.kt

@@ -10,7 +10,7 @@ import com.intuit.hooks.plugin.ensure
 context(Raise<Nel<HookValidationError>>)
 internal fun HookProperty.validate(
     info: HookInfo,
-    property: KSPropertyDeclaration,
+    property: KSPropertyDeclaration
 ) {
     when (this) {
         is HookProperty.Bail -> Unit
@@ -30,7 +30,7 @@ private fun HookInfo.validateAsync(property: KSPropertyDeclaration) {
 context(Raise<Nel<HookValidationError>>)
 private fun HookProperty.Waterfall.validate(
     info: HookInfo,
-    property: KSPropertyDeclaration,
+    property: KSPropertyDeclaration
 ) {
     zipOrAccumulate(
         { arity(info, property) },
@@ -41,15 +41,15 @@ private fun HookProperty.Waterfall.validate(
 context(Raise<HookValidationError.WaterfallMustHaveParameters>)
 private fun HookProperty.Waterfall.arity(
     info: HookInfo,
-    property: KSPropertyDeclaration,
+    property: KSPropertyDeclaration
 ) {
     ensure(!info.zeroArity) { HookValidationError.WaterfallMustHaveParameters(property) }
 }
 
 context(Raise<HookValidationError.WaterfallParameterTypeMustMatch>)
 private fun HookProperty.Waterfall.parameters(
     info: HookInfo,
-    property: KSPropertyDeclaration,
+    property: KSPropertyDeclaration
 ) {
     ensure(info.hookSignature.returnType == info.params.firstOrNull()?.type) {
         HookValidationError.WaterfallParameterTypeMustMatch(property)