Merge pull request #2012 from scala-steward-org/topic/cats-parse

Implement Version.Component.parse with cats-parse

Author: fthomas

build.sbt

@@ -82,6 +82,7 @@ lazy val core = myCrossProject("core")
       Dependencies.caseApp,
       Dependencies.catsCore,
       Dependencies.catsEffect,
+      Dependencies.catsParse,
       Dependencies.circeConfig,
       Dependencies.circeGeneric,
       Dependencies.circeGenericExtras,

modules/benchmark/src/main/scala/org/scalasteward/benchmark/VersionBenchmark.scala

@@ -17,17 +17,17 @@
 package org.scalasteward.benchmark
 
 import org.openjdk.jmh.annotations.{Benchmark, BenchmarkMode, Mode, OutputTimeUnit}
-import org.scalasteward.core.data.Version
+import org.scalasteward.core.data.Version.Component
 
 import java.util.concurrent.TimeUnit
 
 @BenchmarkMode(Array(Mode.AverageTime))
 class VersionBenchmark {
   @Benchmark
   @OutputTimeUnit(TimeUnit.MICROSECONDS)
-  def constructor: Any = {
-    Version("1.1.2-1")
-    Version("8.0.192-R14")
-    Version("1.2.0+9-4a769501")
+  def parseBench: Any = {
+    Component.parse("1.1.2-1")
+    Component.parse("8.0.192-R14")
+    Component.parse("1.2.0+9-4a769501")
   }
 }

modules/core/src/main/scala/org/scalasteward/core/data/Version.scala

@@ -18,6 +18,7 @@ package org.scalasteward.core.data
 
 import cats.Order
 import cats.implicits._
+import cats.parse.{Numbers, Parser, Rfc5234}
 import io.circe.Codec
 import io.circe.generic.extras.semiauto.deriveUnwrappedCodec
 
@@ -149,24 +150,23 @@ object Version {
     final case class Separator(c: Char) extends Component
     case object Empty extends Component
 
-    private val numeric = """^(\d+)(.*)$""".r
-    private val separator = """^([.\-_+])(.*)$""".r
-    private val alpha = """^([^.\-_+\d]+)(.*)$""".r
-    private val hash = """^([-+])(g?\p{XDigit}{6,})(.*)$""".r
+    private val componentsParser = {
+      val digits = ('0' to '9').toSet
+      val separators = Set('.', '-', '_', '+')
+
+      val numeric = Numbers.digits.map(s => List(Numeric(s)))
+      val alpha = Parser.charsWhile(c => !digits(c) && !separators(c)).map(s => List(Alpha(s)))
+      val separator = Parser.charIn(separators).map(c => List(Separator(c)))
+      val hash = (Parser.charIn('-', '+') ~
+        Parser.char('g').string.? ~
+        Rfc5234.hexdig.rep(6).string.filterNot(startsWithDate)).backtrack
+        .map { case ((s, g), h) => List(Separator(s), Hash(g.getOrElse("") + h)) }
+
+      (numeric | alpha | hash | separator).rep0.map(_.flatten)
+    }
 
     def parse(str: String): List[Component] =
-      str match {
-        case "" => List.empty
-        case numeric(value, rest) =>
-          Numeric(value) +: parse(rest)
-        case alpha(value, rest) =>
-          Alpha(value) +: parse(rest)
-        case hash(sep, value, rest) if !startsWithDate(value) =>
-          Separator(sep.head) +: Hash(value) +: parse(rest)
-        case separator(value, rest) =>
-          Separator(value.head) +: parse(rest)
-        case _ => List.empty
-      }
+      componentsParser.parseAll(str).getOrElse(List.empty)
 
     def render(components: List[Component]): String =
       components.map {

project/Dependencies.scala

@@ -11,6 +11,7 @@ object Dependencies {
   val catsEffect = "org.typelevel" %% "cats-effect" % "2.3.3"
   val catsCore = "org.typelevel" %% "cats-core" % "2.4.2"
   val catsLaws = "org.typelevel" %% "cats-laws" % catsCore.revision
+  val catsParse = "org.typelevel" %% "cats-parse" % "0.3.1"
   val circeConfig = "io.circe" %% "circe-config" % "0.8.0"
   val circeGeneric = "io.circe" %% "circe-generic" % "0.13.0"
   val circeGenericExtras = "io.circe" %% "circe-generic-extras" % "0.13.0"