delete unused code (bye bye http4k!)

modules/events-library/build.gradle.kts

@@ -35,11 +35,12 @@ kotlin {
 
     all {
       languageSettings.apply {
-        optIn("kotlin.RequiresOptIn")
         optIn("kotlin.ExperimentalStdlibApi")
-        optIn("kotlin.time.ExperimentalTime")
-        optIn("kotlinx.serialization.ExperimentalSerializationApi")
+        optIn("kotlin.RequiresOptIn")
         optIn("kotlin.js.ExperimentalJsExport")
+        optIn("kotlin.time.ExperimentalTime")
+        optIn("kotlinx.coroutines.FlowPreview")
+        optIn("kotlinx.serialization.ExperimentalSerializationApi")
       }
     }
 
@@ -76,7 +77,6 @@ kotlin {
 
     val jvmMain by getting {
       dependencies {
-        implementation("com.github.aSemy:ts-generator:v1.2.1")
         implementation(kotlin("reflect"))
       }
     }
@@ -95,6 +95,7 @@ kotlin {
   }
 }
 
+
 val jvmJar: TaskProvider<Jar> = tasks.named<Jar>(kotlin.jvm().artifactsTaskName)
 val mainCompilation: Provider<FileCollection> =
   kotlin.jvm().compilations.named("main").map { it.runtimeDependencyFiles }
@@ -111,13 +112,16 @@ val generateTypeScript by tasks.registering(GenerateTypeScriptTask::class) {
   args(temporaryDir.canonicalPath)
 }
 
+
 val schemaTsDistributionName: Provider<String> = providers.provider {
   "${rootProject.name}-${project.name}"
 }
 
+
 val generateTypeScriptOutputFiles: Provider<FileTree> =
   generateTypeScript.map { it.outputs.files.asFileTree }
 
+
 val schemaTs by distributions.registering {
   distributionBaseName.set(schemaTsDistributionName)
   contents {
@@ -125,9 +129,11 @@ val schemaTs by distributions.registering {
   }
 }
 
+
 val schemaTsZipTask: TaskProvider<Zip> = tasks.named<Zip>("${schemaTs.name}DistZip")
 val schemaTsZipTaskArchiveFile: Provider<RegularFile> = schemaTsZipTask.flatMap { it.archiveFile }
 
+
 val typeScriptModelGenerated: Configuration by configurations.creating {
   asProvider()
   typescriptAttributes(objects)

modules/events-library/src/jvmMain/kotlin/dev/adamko/kafkatorio/events/schema/ValueClassTransformer.kt

@@ -1,94 +0,0 @@
-package dev.adamko.kafkatorio.events.schema
-
-import kotlin.contracts.ExperimentalContracts
-import kotlin.contracts.contract
-import kotlin.reflect.KClass
-import kotlin.reflect.KClassifier
-import kotlin.reflect.KProperty
-import kotlin.reflect.KType
-import kotlin.reflect.KTypeProjection
-import kotlin.reflect.full.createType
-import kotlin.reflect.full.declaredMemberProperties
-import kotlin.reflect.full.starProjectedType
-import kotlin.reflect.full.withNullability
-import me.ntrrgc.tsGenerator.ClassTransformer
-
-/**
- * 'Unwrap' value classes
- */
-object ValueClassTransformer : ClassTransformer {
-
-  private val mappedValueClasses: MutableMap<KType, KType> = mutableMapOf(
-    // don't unwrap unsigned numbers - they're mapped to Factorio types
-    UInt::class.starProjectedType to UInt::class.starProjectedType,
-    UByte::class.starProjectedType to UByte::class.starProjectedType,
-    UShort::class.starProjectedType to UShort::class.starProjectedType,
-    ULong::class.starProjectedType to ULong::class.starProjectedType,
-  )
-
-  override fun transformPropertyType(type: KType, property: KProperty<*>, klass: KClass<*>): KType {
-    val unwrappedType =
-      unwrapValueClassType(type, property, klass)
-        ?: unwrapArgs(type, property, klass)
-    return when (unwrappedType) {
-      null -> super.transformPropertyType(type, property, klass)
-      else -> super.transformPropertyType(unwrappedType, property, klass)
-    }
-  }
-
-  private fun unwrapArgs(type: KType, property: KProperty<*>, klass: KClass<*>): KType? {
-
-    val classifier: KClassifier = type.classifier ?: return type
-
-    return if (type.arguments.isNotEmpty()) {
-      println("unwrapping args for $type - ${type.arguments}")
-
-      val args = type.arguments.map { arg: KTypeProjection ->
-        // recursively map each argument
-        val argType = arg.type!!
-        val converted = transformPropertyType(argType, property, klass)
-        KTypeProjection(arg.variance, converted.withNullability(argType.isMarkedNullable))
-      }
-
-      classifier.createType(
-        arguments = args,
-        nullable = type.isMarkedNullable,
-        annotations = type.annotations,
-      )
-    } else {
-      null
-    }
-  }
-
-  private fun unwrapValueClassType(type: KType, property: KProperty<*>, klass: KClass<*>): KType? {
-
-    val valueKlass: KClass<*> = type.classifier as? KClass<*> ?: return null
-
-    return if (isValueClass(type)) {
-      val mappedType = mappedValueClasses.getOrPut(type.withNullability(false)) {
-
-        val result = valueKlass
-          .declaredMemberProperties
-          .first()
-          .returnType
-          .withNullability(type.isMarkedNullable)
-
-        println("unwrapping value class $type -> $result")
-
-        // recursively unwrap...
-        val transformed = transformPropertyType(result, property, klass)
-        transformed.withNullability(false)
-      }
-      mappedType.withNullability(type.isMarkedNullable)
-    } else {
-      null
-    }
-  }
-
-  @OptIn(ExperimentalContracts::class)
-  private fun isValueClass(type: KType?): Boolean {
-    contract { returnsNotNull() implies (type != null) }
-    return (type?.classifier as? KClass<*>)?.isValue == true
-  }
-
-}

modules/events-library/src/jvmMain/kotlin/dev/adamko/kafkatorio/events/schema/kt2ts.kt

@@ -1,147 +0,0 @@
-package dev.adamko.kafkatorio.events.schema
-
-//import dev.adamko.kafkatorio.schema.events.KafkatorioInstantPacketData
-//import dev.adamko.kafkatorio.schema.events.KafkatorioKeyedPacketData
-//import dev.adamko.kafkatorio.schema.events.KafkatorioKeyedPacketKey
-////import dev.adamko.kafkatorio.schema.events.KafkatorioPacket
-//import dev.adamko.kafkatorio.schema.prototypes.FactorioPrototype
-//import kotlin.io.path.Path
-//import kotlin.io.path.createDirectories
-//import me.ntrrgc.tsGenerator.TypeScriptGenerator
-//import org.intellij.lang.annotations.Language
-//
-///**
-// * Convert Kotlin classes to Typescript classes, using [TypeScriptGenerator]
-// */
-//fun main(args: Array<String>) {
-//
-//  val gen = TypeScriptGenerator(
-//    rootClasses = buildSet {
-////      add(KafkatorioPacket::class)
-////      addAll(KafkatorioPacket::class.sealedSubclasses)
-//
-//      add(KafkatorioInstantPacketData::class)
-//      addAll(KafkatorioInstantPacketData::class.sealedSubclasses)
-//
-//      add(KafkatorioKeyedPacketData::class)
-//      addAll(KafkatorioKeyedPacketData::class.sealedSubclasses)
-//      addAll(KafkatorioKeyedPacketKey::class.sealedSubclasses)
-//
-//      add(FactorioPrototype::class)
-//      addAll(FactorioPrototype::class.sealedSubclasses)
-//    },
-//    mappings = mapOf(
-//      // builtin Factorio numeric types > `typed-factorio/generated/builtin-types.d.ts`
-//      Float::class to "float",
-//      Double::class to "double",
-//      Int::class to "int",
-//      Byte::class to "int8",
-//      UInt::class to "uint",
-//      UByte::class to "uint8",
-//      UShort::class to "uint16",
-//      ULong::class to "uint64",
-//    ),
-//    classTransformers = listOf(
-//      ValueClassTransformer,
-////        PropertyNameTransformer,
-//    ),
-////      voidType = VoidType.UNDEFINED,
-//  )
-//
-//  val definitions = gen.definitionsText
-//
-//  when (val filename = args.firstOrNull()) {
-//    null -> println(definitions)
-//    else -> {
-//      val outPath = Path(filename)
-//      outPath.createDirectories()
-//
-//      splitDefinitions(definitions)
-//        .forEach { (defFile, def) ->
-//          val outFile = outPath.resolve(defFile).toFile()
-//          outFile.printWriter().use {
-//            it.println(kt2tsHeader)
-//            it.print(def)
-//          }
-//          println("Generated file: $outFile")
-//        }
-//
-//    }
-//  }
-//}
-//
-//
-///** Split the TypeScript interfaces into different files */
-//private fun splitDefinitions(definitions: String): Map<String, String> {
-//  return definitions
-//    .split("\n\n")
-//    .groupBy { def ->
-//
-//      when {
-//        def isInterface "KafkatorioPacket"
-//            || def extendsAny listOf("KafkatorioPacket")
-//            || def isType "KafkatorioPacketDataType"
-//             -> "kafkatorio-packet.d.ts"
-//
-//        def isInterface "KafkatorioInstantPacketData"
-//            || def extends "KafkatorioInstantPacketData"
-//            || def isType "KafkatorioInstantPacketDataType"
-//
-//            || def isInterface "ConfigurationUpdateGameData"
-//            || def isInterface "ConfigurationUpdateModData"
-//             -> "kafkatorio-instant-packet.d.ts"
-//
-//        def isInterface "KafkatorioKeyedPacket"
-//            || def isInterface "KafkatorioKeyedPacketData"
-//            || def extends "KafkatorioKeyedPacket"
-//            || def isType "KafkatorioKeyedPacketDataType"
-//
-//            || def isInterface "KafkatorioKeyedPacketKey"
-//             -> "kafkatorio-keyed-packet.d.ts"
-//
-//        def isInterface "FactorioPrototypes"
-//            || def isInterface "FactorioPrototype"
-//            || def extends "FactorioPrototype"
-//            || def isType "PrototypeObjectName"
-//             -> "prototype.d.ts"
-//
-//        else -> "schema.d.ts"
-//      }
-//    }
-//    .mapValues { (_, def) ->
-//      def
-//        .sorted()
-//        .joinToString("\n\n", postfix = "\n")
-//        .replace("    ", "  ")
-//    }
-//}
-//
-//@Language("TypeScript")
-//val kt2tsHeader = """
-//  |// Generated by TypeScriptGenerator - do not edit this file manually
-//  |
-//""".trimMargin()
-//
-//private infix fun String.extends(types: String): Boolean =
-//  contains(Regex(".+extends.*(${types})"))
-//
-//private infix fun String.extendsAny(types: List<String>): Boolean =
-//  extends(types.joinToString("|") { "$it,".replaceAfterLast(',', "") })
-//
-//private infix fun String.isInterface(type: String): Boolean =
-//  contains(Regex("interface $type.*"))
-//
-//
-//private infix fun String.isType(type: String): Boolean =
-//  contains(Regex("type $type.*"))
-//
-//
-////object PropertyNameTransformer : ClassTransformer {
-////  override fun transformPropertyName(
-////    propertyName: String,
-////    property: KProperty<*>,
-////    klass: KClass<*>
-////  ): String {
-////    return camelCaseToSnakeCase(propertyName)
-////  }
-////}

modules/events-library/src/jvmMain/kotlin/dev/adamko/kafkatorio/library/FileEventsFlow.kt

@@ -1,4 +1,4 @@
-package dev.adamko.kafkatorio.processor.misc
+package dev.adamko.kafkatorio.library
 
 import java.io.File
 import java.nio.file.FileSystems