New abstractions

.github/workflows/build-and-test.yml

@@ -10,11 +10,12 @@ jobs:
   build-and-test:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - name: Set up JDK 17
-        uses: actions/setup-java@v1
+      - uses: actions/checkout@v4
+      - name: Set up JDK 21
+        uses: actions/setup-java@v3
         with:
-          java-version: 17
+          distribution: 'temurin'
+          java-version: 21
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
       - name: Build, Test, Generate Scoverage Report with Gradle

.github/workflows/coverage.yml

@@ -12,16 +12,17 @@ jobs:
       TESTCONTAINERS_RYUK_DISABLED: true
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - name: Set up JDK 17
-        uses: actions/setup-java@v1
+      - uses: actions/checkout@v4
+      - name: Set up JDK 21
+        uses: actions/setup-java@v3
         with:
-          java-version: 17
+          distribution: 'temurin'
+          java-version: 21
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
       - name: Build, Test, Generate Scoverage Report with Gradle
-        run: ./gradlew build test
-#      - name: Upload coverage to Codecov
-#        uses: codecov/codecov-action@v1
-#        with:
-#          directory: ./build/reports/scoverage
+        run: ./gradlew clean check
+      - name: Upload coverage to Codecov
+        uses: codecov/codecov-action@v4-beta
+        env:
+          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

.github/workflows/publish-snapshots.yml

@@ -8,11 +8,12 @@ jobs:
   push-snapshots:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - name: Set up JDK 17
-        uses: actions/setup-java@v1
+      - uses: actions/checkout@v4
+      - name: Set up JDK 21
+        uses: actions/setup-java@v3
         with:
-          java-version: 17
+          distribution: 'temurin'
+          java-version: 21
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
       - name: Push latest Rudiments snapshots to Maven Snapshots repo

README.md

@@ -1,7 +1,7 @@
 # Hard Core
 
 ![Rudiments build](https://github.com/rudiments-dev/hardcore/workflows/Rudiments%20repository%20builds%20and%20coverage%20reports/badge.svg?branch=develop)
-[![codecov](https://codecov.io/gh/rudiments-dev/hardcore/branch/develop/graph/badge.svg)](https://codecov.io/gh/rudiments-dev/hardcore)
+[![codecov](https://codecov.io/gh/rudiments-dev/hardcore/graph/badge.svg?token=NG67EUNPTZ)](https://codecov.io/gh/rudiments-dev/hardcore)
 [![Maven Central](https://img.shields.io/maven-central/v/dev.rudiments/implementation.svg?label=Maven%20Central)](https://search.maven.org/search?q=g:%22dev.rudiments%22%20AND%20a:%22implementation%22)
 
 Research project and bootstrap library.

build.gradle

@@ -1,61 +1,20 @@
-buildscript {
-    repositories {
-        maven {
-            url "https://plugins.gradle.org/m2/"
-        }
-    }
-}
-
-def base_version = '0.4-SNAPSHOT'
-
-allprojects {
-    group 'dev.rudiments'
-    version base_version
-
-    repositories {
-        mavenLocal()
-        mavenCentral()
-    }
+plugins {
+    id 'dev.rudiments.scala-app-conventions'
+    id 'jacoco-report-aggregation'
 }
 
-def scalaModules() {
-    subprojects.findAll { new File(it.projectDir, 'src/main/scala').directory }
+dependencies {
+    jacocoAggregation project(':example')
 }
 
-configure(scalaModules()) {
-    apply plugin: 'java'
-    apply plugin: 'scala'
-
-    sourceCompatibility = 17
-    targetCompatibility = 17
-
-    test {
-        reports {
-            html.required = true
-            junitXml.required = true
-        }
-        maxHeapSize = "2048m"
-        testLogging {
-            events "skipped", "failed"
-            exceptionFormat "full"
+reporting {
+    reports {
+        testCodeCoverageReport(JacocoCoverageReport) {
+            testType = TestSuiteType.UNIT_TEST
         }
     }
+}
 
-    dependencies {
-        implementation 'org.scala-lang:scala-library:2.13.7'
-        implementation 'com.typesafe.akka:akka-actor_2.13:2.6.17'
-        implementation 'com.typesafe.akka:akka-slf4j_2.13:2.6.17'
-        implementation 'com.typesafe.akka:akka-stream_2.13:2.6.17'
-
-        implementation 'com.beachape:enumeratum_2.13:1.7.0'
-
-        implementation 'com.typesafe.scala-logging:scala-logging_2.13:3.9.4'
-        implementation 'org.slf4j:slf4j-api:1.7.32'
-
-        testImplementation 'org.scalatest:scalatest_2.13:3.2.10'
-        testImplementation 'org.scalatestplus:junit-4-13_2.13:3.2.10.0'
-
-        testImplementation 'junit:junit:4.13.2'
-        testImplementation 'ch.qos.logback:logback-classic:1.2.7'
-    }
+tasks.named('check') {
+    dependsOn tasks.named('testCodeCoverageReport', JacocoReport)
 }

buildSrc/build.gradle

@@ -0,0 +1,7 @@
+plugins {
+    id 'groovy-gradle-plugin'
+}
+
+repositories {
+    gradlePluginPortal()
+}

buildSrc/settings.gradle

@@ -0,0 +1,7 @@
+dependencyResolutionManagement {
+    versionCatalogs {
+        create('libs', { from(files("../gradle/libs.versions.toml")) })
+    }
+}
+
+rootProject.name = 'buildSrc'

buildSrc/src/main/groovy/dev.rudiments.scala-app-conventions.gradle

@@ -0,0 +1,4 @@
+plugins {
+    id 'dev.rudiments.scala-conventions'
+    id 'application'
+}

buildSrc/src/main/groovy/dev.rudiments.scala-conventions.gradle

@@ -0,0 +1,55 @@
+plugins {
+    id 'java'
+    id 'scala'
+    id 'jacoco'
+}
+
+def baseVersion = '0.6-SNAPSHOT'
+
+repositories {
+    mavenLocal()
+    mavenCentral()
+}
+
+group = 'dev.rudiments'
+version = baseVersion
+
+dependencies {
+    implementation 'org.scala-lang:scala3-library_3:3.3.1'
+    implementation 'org.slf4j:slf4j-api:2.0.11'
+
+
+    testImplementation 'org.scalatest:scalatest_3:3.2.17'
+    testImplementation 'org.scalatestplus:junit-5-10_3:3.2.17.0'
+
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'
+    testImplementation 'org.junit.platform:junit-platform-launcher:1.10.0'
+    testRuntimeOnly 'org.junit.platform:junit-platform-engine:1.10.0'
+
+    testRuntimeOnly 'ch.qos.logback:logback-classic:1.4.14'
+}
+
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(21)
+    }
+}
+
+test {
+    useJUnitPlatform {
+        includeEngines 'scalatest'
+        testLogging {
+            events("passed", "skipped", "failed", "standard_error")
+        }
+    }
+}
+
+jacocoTestReport {
+    dependsOn test
+    reports {
+        xml.required = true
+        html.required = false
+    }
+}
+
+check.dependsOn jacocoTestReport

buildSrc/src/main/groovy/dev.rudiments.scala-lib-conventions.gradle

@@ -0,0 +1,4 @@
+plugins {
+    id 'dev.rudiments.scala-conventions'
+    id 'java-library'
+}

core/build.gradle

@@ -1,3 +1,10 @@
+plugins {
+    id 'dev.rudiments.scala-lib-conventions'
+}
+
 dependencies {
+    implementation 'io.github.java-diff-utils:java-diff-utils:4.12'
 
+    implementation 'io.circe:circe-core_3:0.15.0-M1'
+    implementation 'io.circe:circe-generic_3:0.15.0-M1'
 }

core/src/main/scala/dev/rudiments/codecs/Codec.scala

@@ -0,0 +1,42 @@
+package dev.rudiments.codecs
+
+class Encoder[A, B](val en: A => Result[B]) extends OneWay(en) {
+  def apply(a: A): Result[B] = this.en(a)
+  def toCodec(de: B => Result[A]): Codec[A, B] = Codec(en, de)
+}
+object Encoder {
+  def apply[A, B](f: A => B): Encoder[A, B] = new Encoder(f.andThen(r => Result.Ok(r)))
+  //TODO if error in B
+}
+
+class Decoder[A, B](val de: B => Result[A]) extends Encoder[B, A](de) {}
+object Decoder {
+  def apply[A, B](f: B => A): Decoder[A, B] = new Decoder(f.andThen(r => Result.Ok(r)))
+}
+
+class Codec[A, B](en: A => Result[B], de: B => Result[A]) {
+  def bimap[C](
+    f: B => C, g: C => B
+  ): Codec[A, C] = Codec(
+    en.andThen(_.map(f)), g.andThen(de)
+  )
+}
+
+enum Result[A] {
+  case Error(e: Exception)
+  case Ok(value: A)
+
+  def map[B](f: A => B): Result[B] = this match {
+    case Result.Error(e) => Result.Error(e)
+    case Result.Ok(v) => Result.Ok(f(v))
+  }
+
+  def flatMap[B](f: A => Result[B]): Result[B] = this match {
+    case Result.Error(e) => Result.Error(e)
+    case Result.Ok(v) => f(v)
+  }
+}
+
+class OneWay[A, B](val t: A => Result[B]) {
+  def map[C](f: B => C): OneWay[A, C] = OneWay(t.andThen(_.map(f)))
+}

core/src/main/scala/dev/rudiments/codecs/MJ.scala

@@ -0,0 +1,63 @@
+package dev.rudiments.codecs
+
+import dev.rudiments.utils.Log
+
+import scala.compiletime.{constValue, erasedValue, error, summonFrom}
+import scala.deriving.Mirror
+
+object MJ extends Log {
+  type En[A] = OneWay[A, TS]
+
+  given intToNumber: OneWay[Int, TS.Number] = OneWay(i => Result.Ok(TS.Number(i)))
+  given strToText: OneWay[String, TS.Text] = OneWay(s => Result.Ok(TS.Text(s)))
+  given many[S, T <: TS](using t: OneWay[S, T]): OneWay[Iterable[S], TS.Many] = OneWay(l =>
+    l.foldLeft(Result.Ok[TS.Many](TS.Many(Seq.empty))) { (acc, i) =>
+      for {
+        el <- t.t(i)
+        many <- acc
+      } yield TS.Many(many.of :+ el)
+    }
+  )
+  given index[K, V, T <: TS](using keys: OneWay[K, TS.Text], values: OneWay[V, T]): OneWay[Map[K, V], TS.Idx] = OneWay( m =>
+    m.foldLeft(Result.Ok[TS.Idx](TS.Idx(Map.empty))) { case (acc, (k, v)) =>
+      for {
+        key <- keys.t(k)
+        value <- values.t(v)
+        many <- acc
+      } yield TS.Idx(many.of + (key -> value))
+    }
+  )
+
+  inline final def summonLabelsRec[T <: Tuple]: List[String] = inline erasedValue[T] match {
+    case _: EmptyTuple => Nil
+    case _: (t *: ts) => constValue[t].asInstanceOf[String] :: summonLabelsRec[ts]
+  }
+
+  inline final def summonEncoder[A]: En[A] = summonFrom {
+    case encodeA: En[A] => encodeA
+    case _: Mirror.Of[A] => derived[A]
+  }
+
+  inline final def summonEncodersRec[A <: Tuple]: List[En[_]] =
+    inline erasedValue[A] match {
+      case _: EmptyTuple => Nil
+      case _: (t *: ts) => summonEncoder[t] :: summonEncodersRec[ts]
+    }
+
+  inline final def derived[A](using A: Mirror.Of[A]): En[A] = {
+    val name = constValue[A.MirroredLabel].asInstanceOf[String]
+    val labels = summonLabelsRec[A.MirroredElemLabels].toArray
+    val encoders = summonEncodersRec[A.MirroredElemTypes].toArray
+
+
+    log.info("{} with labels {}", name, labels.mkString("[", ", ", "]"))
+    ???
+  }
+}
+
+enum TS {
+  case Number(i: Int)
+  case Text(s: String)
+  case Many(of: Seq[TS])
+  case Idx(of: Map[TS.Text, TS])
+}