Merge branch 'master' into named-tuples-support

Author: arainko

.github/workflows/ci.yml

@@ -305,19 +305,19 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-22.04]
-        java: [temurin@11]
+        java: [temurin@17]
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout current branch (fast)
         uses: actions/checkout@v6
 
-      - name: Setup Java (temurin@11)
-        id: setup-java-temurin-11
-        if: matrix.java == 'temurin@11'
+      - name: Setup Java (temurin@17)
+        id: setup-java-temurin-17
+        if: matrix.java == 'temurin@17'
         uses: actions/setup-java@v5
         with:
           distribution: temurin
-          java-version: 11
+          java-version: 17
 
       - uses: coursier/setup-action@v1
         with:

.scalafmt.conf

@@ -1,4 +1,4 @@
-version=3.11.0
+version=3.11.4
 docstrings.style = keep
 align.preset = more
 maxColumn = 120

build.sbt

@@ -43,7 +43,6 @@ lazy val kindProjector = "org.typelevel" % "kind-projector" % "0.13.4" cross Cro
 
 lazy val buildSettings = Seq(
   scalacOptions ++= Seq(
-    "-release:8",
     "-encoding",
     "UTF-8",
     "-feature",
@@ -108,16 +107,16 @@ lazy val buildSettings = Seq(
 
 lazy val catsVersion      = "2.13.0"
 lazy val scala2Version    = "2.13.18"
-lazy val scala3Version    = "3.3.7"
+lazy val scala3Version    = "3.3.8"
 lazy val scalaNextVersion = "3.8.4"
 
 lazy val cats              = Def.setting("org.typelevel" %%% "cats-core" % catsVersion)
 lazy val catsFree          = Def.setting("org.typelevel" %%% "cats-free" % catsVersion)
 lazy val catsLaws          = Def.setting("org.typelevel" %%% "cats-laws" % catsVersion)
 lazy val alleycats         = Def.setting("org.typelevel" %%% "alleycats-core" % catsVersion)
 lazy val shapeless         = Def.setting("com.chuusai" %%% "shapeless" % "2.3.13")
-lazy val refinedDep        = Def.setting("eu.timepit" %%% "refined" % "0.11.3")
-lazy val refinedScalacheck = Def.setting("eu.timepit" %%% "refined-scalacheck" % "0.11.3" % "test")
+lazy val refinedDep        = Def.setting("eu.timepit" %%% "refined" % "0.11.4")
+lazy val refinedScalacheck = Def.setting("eu.timepit" %%% "refined-scalacheck" % "0.11.4" % "test")
 
 lazy val discipline      = Def.setting("org.typelevel" %%% "discipline-core" % "1.7.0")
 lazy val munit           = Def.setting("org.scalameta" %%% "munit" % "1.0.0-M6" % Test)
@@ -134,10 +133,31 @@ lazy val scalaNativeSettings = Seq(
   tlMimaPreviousVersions := Set.empty
 )
 
-lazy val monocleSettings       = buildSettings
-lazy val monocleJvmSettings    = monocleSettings
-lazy val monocleJsSettings     = monocleSettings ++ scalajsSettings
-lazy val monocleNativeSettings = monocleSettings ++ scalaNativeSettings
+lazy val defaultReleaseOption = "-release:8"
+
+lazy val monocleSettings    = buildSettings
+lazy val monocleJvmSettings = monocleSettings ++ Seq(
+  scalacOptions ++= {
+    if (scalaVersion.value.startsWith("3.3.")) {
+      Seq(
+        "-Yfuture-lazy-vals",
+        "-release:11"
+      )
+    } else if (scalaBinaryVersion.value == "3") {
+      Nil
+    } else {
+      Seq(
+        defaultReleaseOption
+      )
+    }
+  }
+)
+lazy val monocleJsSettings = monocleSettings ++ scalajsSettings ++ Seq(
+  scalacOptions += defaultReleaseOption
+)
+lazy val monocleNativeSettings = monocleSettings ++ scalaNativeSettings ++ Seq(
+  scalacOptions += defaultReleaseOption
+)
 
 lazy val root = tlCrossRootProject.aggregate(
   core,

core/shared/src/main/scala-3/monocle/internal/IsoFields.scala

@@ -1,28 +1,27 @@
 package monocle.internal
 
-import monocle.Iso
+import monocle.{Iso, PIso}
 import scala.quoted.{quotes, Expr, Quotes, Type}
 import scala.deriving.Mirror
 
 object IsoFields {
-  transparent inline def apply[S <: Product](using mirror: Mirror.ProductOf[S]): Iso[S, Tuple] =
+  transparent inline def apply[S <: Product](using mirror: Mirror.ProductOf[S]): PIso[S, S, ? <: Tuple, ? <: Tuple] =
     ${ IsoFieldsImpl.apply[S]('mirror) }
 }
 
 private[monocle] object IsoFieldsImpl {
 
-  def apply[S <: Product](mirror: Expr[Mirror.ProductOf[S]])(using Quotes, Type[S]): Expr[Iso[S, Tuple]] = {
-
-    def whitebox[A <: Tuple](e: Expr[Iso[S, A]]): Expr[Iso[S, Tuple]] =
-      e.asInstanceOf[Expr[Iso[S, Tuple]]]
-
+  def apply[S <: Product](
+    mirror: Expr[Mirror.ProductOf[S]]
+  )(using Quotes, Type[S]): Expr[PIso[S, S, ? <: Tuple, ? <: Tuple]] =
     mirror match {
       case '{ type a <: Tuple; $m: Mirror.ProductOf[S] { type MirroredElemTypes = `a` } } =>
-        whitebox('{
+        '{
           val f: S => a = Tuple.fromProductTyped(_)(using $m)
           val g: a => S = $m.fromProduct(_)
           Iso[S, a](f)(g)
-        })
+        }
+      case other =>
+        quotes.reflect.report.errorAndAbort(s"Unexpected mirror type: ${other.show}")
     }
-  }
 }

core/shared/src/main/scala-3/monocle/syntax/MacroSyntax.scala

@@ -13,7 +13,7 @@ trait MacroSyntax {
       * Case classes with 0 fields will correspond with `EmptyTuple`, 1 with `Tuple1[field type]`, 2 or more with a
       * tuple of all field types in the same order as the fields themselves.
       */
-    transparent inline def fields[S <: Product: Mirror.ProductOf]: Iso[S, Tuple] =
+    transparent inline def fields[S <: Product: Mirror.ProductOf]: PIso[S, S, ? <: Tuple, ? <: Tuple] =
       IsoFields[S]
   }
 

core/shared/src/main/scala/monocle/std/String.scala

@@ -36,8 +36,10 @@ trait StringOptics extends PlatformSpecificStringOptics {
     // we reject cases where String will be an invalid Prism according 2nd Prism law
     // * String starts with +
     // * String starts with 0 and has multiple digits
+    // * String starts with -0 (negative zero forms never round-trip)
     def inputBreaksPrismLaws(input: String): Boolean =
-      s.isEmpty || s.startsWith("+") || (s.startsWith("0") && s.length > 1)
+      s.isEmpty || s.startsWith("+") || (s.startsWith("0") && s.length > 1) ||
+        (s.length > 1 && s.charAt(0) == '-' && s.charAt(1) == '0')
 
     if (inputBreaksPrismLaws(s)) None
     else

core/shared/src/test/scala-3/monocle/internal/IsoFieldsTest.scala

@@ -31,4 +31,13 @@ final class IsoFieldsTest extends munit.FunSuite {
     assertEquals(iso.reverseGet(("hi", 5)), Foo("hi", 5))
     assertEquals(iso.reverseGet(iso.get(Foo("hi", 5))), Foo("hi", 5))
   }
+
+  test("fields extension method works") {
+    case class Foo(s: String, i: Int)
+    val foo                          = Foo("hi", 5)
+    val iso: Iso[Foo, (String, Int)] = Iso.fields[Foo]
+
+    assertEquals(iso.get(foo), ("hi", 5))
+    assertEquals(iso.reverseGet(("hi", 5)), foo)
+  }
 }

macro/src/main/scala-3/monocle/macros/GenIso.scala

@@ -1,6 +1,6 @@
 package monocle.macros
 
-import monocle.Iso
+import monocle.{Iso, PIso}
 import scala.language.`3.0`
 import scala.deriving.*
 import scala.quoted.*
@@ -58,23 +58,18 @@ object GenIso {
     * types in the same order as the fields themselves.
     */
   @deprecated("use monocle.Iso.fields", since = "3.1.0")
-  transparent inline def fields[S <: Product](using m: Mirror.ProductOf[S]): Iso[S, Any] =
+  transparent inline def fields[S <: Product](using m: Mirror.ProductOf[S]): PIso[S, S, ?, ?] =
     ${ _fields[S]('m) }
 
-  private def _fields[S <: Product](e: Expr[Mirror.ProductOf[S]])(using Quotes, Type[S]): Expr[Iso[S, Any]] = {
-
-    def whitebox[A](e: Expr[Iso[S, A]]): Expr[Iso[S, Any]] =
-      e.asInstanceOf[Expr[Iso[S, Any]]]
-
+  private def _fields[S <: Product](e: Expr[Mirror.ProductOf[S]])(using Quotes, Type[S]): Expr[PIso[S, S, ?, ?]] =
     e match {
       case '{ $m: Mirror.ProductOf[S] { type MirroredElemTypes = EmptyTuple } } =>
-        whitebox(_unit[S](e))
+        _unit[S](e)
 
       case '{ $m: Mirror.ProductOf[S] { type MirroredElemTypes = a *: EmptyTuple } } =>
-        whitebox(_apply[S, a](e))
+        _apply[S, a](e)
 
       case _ =>
-        whitebox('{ monocle.internal.IsoFields[S](using $e) })
+        '{ monocle.internal.IsoFields[S](using $e) }
     }
-  }
 }

project/build.properties

@@ -1 +1 @@
-sbt.version=1.12.11
+sbt.version=1.12.14

project/plugins.sbt

@@ -1,12 +1,12 @@
-addSbtPlugin("org.typelevel"      % "sbt-typelevel-ci-release" % "0.8.5")
+addSbtPlugin("org.typelevel"      % "sbt-typelevel-ci-release" % "0.8.7")
 addSbtPlugin("com.eed3si9n"       % "sbt-buildinfo"            % "0.13.1")
 addSbtPlugin("pl.project13.scala" % "sbt-jmh"                  % "0.4.8")
 
-addSbtPlugin("org.scala-js"       % "sbt-scalajs"                   % "1.21.0")
+addSbtPlugin("org.scala-js"       % "sbt-scalajs"                   % "1.22.0")
 addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject"      % "1.3.2")
-addSbtPlugin("org.scala-native"   % "sbt-scala-native"              % "0.5.11")
+addSbtPlugin("org.scala-native"   % "sbt-scala-native"              % "0.5.12")
 addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.2")
-addSbtPlugin("org.scalameta"      % "sbt-scalafmt"                  % "2.6.0")
-addSbtPlugin("org.scalameta"      % "sbt-mdoc"                      % "2.9.0")
+addSbtPlugin("org.scalameta"      % "sbt-scalafmt"                  % "2.6.2")
+addSbtPlugin("org.scalameta"      % "sbt-mdoc"                      % "2.9.1")
 
 scalacOptions += "-deprecation"