Prototype of a nested-paths for subtypes and collections (internally,…

… no tests nor DSL changes which would allow using it)

chimney/src/main/scala-2/io/scalaland/chimney/internal/compiletime/ChimneyTypesPlatform.scala

@@ -347,6 +347,27 @@
  if (A.isCtor[runtime.Path.Match[?, ?]]) Some(A.param_<[runtime.Path](0) -> A.param(1))
  else scala.None
  }
+ object EachItem extends EachItemModule {
+ def apply[Init <: runtime.Path: Type]: Type[runtime.Path.EachItem[Init]] =
+ weakTypeTag[runtime.Path.EachItem[Init]]
+ def unapply[A](A: Type[A]): Option[?<[runtime.Path]] =
+ if (A.isCtor[runtime.Path.EachItem[?]]) Some(A.param_<[runtime.Path](0))
+ else scala.None
+ }
+ object EachMapKey extends EachMapKeyModule {
+ def apply[Init <: runtime.Path: Type]: Type[runtime.Path.EachMapKey[Init]] =
+ weakTypeTag[runtime.Path.EachMapKey[Init]]
+ def unapply[A](A: Type[A]): Option[?<[runtime.Path]] =
+ if (A.isCtor[runtime.Path.EachMapKey[?]]) Some(A.param_<[runtime.Path](0))
+ else scala.None
+ }
+ object EachMapValue extends EachMapValueModule {
+ def apply[Init <: runtime.Path: Type]: Type[runtime.Path.EachMapValue[Init]] =
+ weakTypeTag[runtime.Path.EachMapValue[Init]]
+ def unapply[A](A: Type[A]): Option[?<[runtime.Path]] =
+ if (A.isCtor[runtime.Path.EachMapValue[?]]) Some(A.param_<[runtime.Path](0))
+ else scala.None
+ }
  }
  }
 }

chimney/src/main/scala-3/io/scalaland/chimney/internal/compiletime/ChimneyTypesPlatform.scala

@@ -319,6 +319,30 @@
  Some((Type[init].as_?<[runtime.Path], Type[subtype].as_??))
  case _ => scala.None
  }
+ object EachItem extends EachItemModule {
+ def apply[Init <: runtime.Path: Type]: Type[runtime.Path.EachItem[Init]] =
+ quoted.Type.of[runtime.Path.EachItem[Init]]
+ def unapply[A](tpe: Type[A]): Option[?<[runtime.Path]] = tpe match
+ case '[runtime.Path.EachItem[init]] =>
+ Some(Type[init].as_?<[runtime.Path])
+ case _ => scala.None
+ }
+ object EachMapKey extends EachMapKeyModule {
+ def apply[Init <: runtime.Path: Type]: Type[runtime.Path.EachMapKey[Init]] =
+ quoted.Type.of[runtime.Path.EachMapKey[Init]]
+ def unapply[A](tpe: Type[A]): Option[?<[runtime.Path]] = tpe match
+ case '[runtime.Path.EachMapKey[init]] =>
+ Some(Type[init].as_?<[runtime.Path])
+ case _ => scala.None
+ }
+ object EachMapValue extends EachMapValueModule {
+ def apply[Init <: runtime.Path: Type]: Type[runtime.Path.EachMapValue[Init]] =
+ quoted.Type.of[runtime.Path.EachMapValue[Init]]
+ def unapply[A](tpe: Type[A]): Option[?<[runtime.Path]] = tpe match
+ case '[runtime.Path.EachMapValue[init]] =>
+ Some(Type[init].as_?<[runtime.Path])
+ case _ => scala.None
+ }
  }
  }
 }

chimney/src/main/scala/io/scalaland/chimney/internal/compiletime/ChimneyTypes.scala

@@ -246,6 +246,24 @@ private[compiletime] trait ChimneyTypes { this: ChimneyDefinitions =>
  Any,
  runtime.Path.Match
  ] { this: Match.type => }
+ val EachItem: EachItemModule
+ trait EachItemModule
+ extends Type.Ctor1UpperBounded[
+ runtime.Path,
+ runtime.Path.EachItem
+ ] { this: EachItem.type => }
+ val EachMapKey: EachMapKeyModule
+ trait EachMapKeyModule
+ extends Type.Ctor1UpperBounded[
+ runtime.Path,
+ runtime.Path.EachMapKey
+ ] { this: EachMapKey.type => }
+ val EachMapValue: EachMapValueModule
+ trait EachMapValueModule
+ extends Type.Ctor1UpperBounded[
+ runtime.Path,
+ runtime.Path.EachMapValue
+ ] { this: EachMapValue.type => }
  }
 
  // You can `import ChimneyType.Implicits.*` in your shared code to avoid providing types manually, while avoiding conflicts

chimney/src/main/scala/io/scalaland/chimney/internal/compiletime/derivation/transformer/Configurations.scala

@@ -85,22 +85,22 @@
 
  final protected class Path private (private val segments: Vector[Path.Segment]) {
 
- import Path.Segment.*
+ import Path.*, Path.Segment.*
  def select(name: String): Path = new Path(segments :+ Select(name))
  def `match`[Tpe: Type]: Path = new Path(segments :+ Match(Type[Tpe].as_??))
- // TODO: implement these
- def eachItem: Path = Path.clean
- def eachMapKey: Path = Path.clean
- def eachMapValue: Path = Path.clean
+ def eachItem: Path = new Path(segments :+ EachItem)
+ def eachMapKey: Path = new Path(segments :+ EachMapKey)
+ def eachMapValue: Path = new Path(segments :+ EachMapValue)
 
  @scala.annotation.tailrec
  def drop(prefix: Path)(implicit ctx: TransformationContext[?, ?]): Option[Path] = (prefix, this) match {
- case (Path.Root, result) => Some(result)
- case (Path.AtField(name1, prefix2), Path.AtField(name2, path2)) if areFieldNamesMatching(name1, name2) =>
- path2.drop(prefix2)
- case (Path.AtSubtype(tpe1, prefix2), Path.AtSubtype(tpe2, path2)) if tpe1.Underlying <:< tpe2.Underlying =>
- path2.drop(prefix2)
- case _ => None
+ case (Root, result) => Some(result)
+ case (AtField(name, prefix2), AtField(name2, tail)) if areFieldNamesMatching(name, name2) => tail.drop(prefix2)
+ case (AtSubtype(tpe, prefix2), AtSubtype(tpe2, tail)) if tpe.Underlying <:< tpe2.Underlying => tail.drop(prefix2)
+ case (AtItem(prefix2), AtItem(tail)) => tail.drop(prefix2)
+ case (AtMapKey(prefix2), AtMapKey(tail)) => tail.drop(prefix2)
+ case (AtMapValue(prefix2), AtMapValue(tail)) => tail.drop(prefix2)
+ case _ => None
  }
 
  override def equals(obj: Any): Boolean = obj match {
@@ -114,8 +114,6 @@
 
  val Root = new Path(Vector())
 
- val clean = new Path(Vector(Segment.Clean))
-
  object AtField {
  def unapply(path: Path): Option[(String, Path)] =
  path.segments.headOption.collect { case Segment.Select(name) => name -> new Path(path.segments.tail) }
@@ -126,21 +124,43 @@
  path.segments.headOption.collect { case Segment.Match(tpe) => tpe -> new Path(path.segments.tail) }
  }
 
+ object AtItem {
+ def unapply(path: Path): Option[Path] =
+ path.segments.headOption.collect { case Segment.EachItem => new Path(path.segments.tail) }
+ }
+
+ object AtMapKey {
+ def unapply(path: Path): Option[Path] =
+ path.segments.headOption.collect { case Segment.EachMapKey => new Path(path.segments.tail) }
+ }
+
+ object AtMapValue {
+ def unapply(path: Path): Option[Path] =
+ path.segments.headOption.collect { case Segment.EachMapValue => new Path(path.segments.tail) }
+ }
+
  sealed private trait Segment extends scala.Product with Serializable
  private object Segment {
  final case class Select(name: String) extends Segment {
  override def toString: String = s".$name"
  }
  final case class Match(tpe: ??) extends Segment {
-
  override def equals(obj: Any): Boolean = obj match {
  case Match(tpe2) => tpe.Underlying =:= tpe2.Underlying
  case _ => false
  }
- // TODO: figure out a better name
+
  override def toString: String = s".whenSubtype[${Type.prettyPrint(tpe.Underlying)}]"
  }
- case object Clean extends Segment
+ case object EachItem extends Segment {
+ override def toString: String = ".eachItem"
+ }
+ case object EachMapKey extends Segment {
+ override def toString: String = ".eachMapKey"
+ }
+ case object EachMapValue extends Segment {
+ override def toString: String = ".eachMapValue"
+ }
  }
  }
 
@@ -432,6 +452,15 @@
  case ChimneyType.Path.Match(init, subtype) =>
  import init.Underlying as PathType2, subtype.Underlying as Subtype
  extractPath[PathType2].`match`[Subtype]
+ case ChimneyType.Path.EachItem(init) =>
+ import init.Underlying as PathType2
+ extractPath[PathType2].eachItem
+ case ChimneyType.Path.EachMapKey(init) =>
+ import init.Underlying as PathType2
+ extractPath[PathType2].eachMapKey
+ case ChimneyType.Path.EachMapValue(init) =>
+ import init.Underlying as PathType2
+ extractPath[PathType2].eachMapValue
  case _ =>
  // $COVERAGE-OFF$
  reportError(s"Invalid internal Path shape: ${Type.prettyPrint[PathType]}!!")

chimney/src/main/scala/io/scalaland/chimney/internal/compiletime/derivation/transformer/rules/TransformProductToProductRuleModule.scala

@@ -682,6 +682,9 @@
  path match {
  case Path.AtField(name, path2) => appendPath[A](appendPath[A](expr, name), path2)
  case Path.AtSubtype(_, path2) => appendPath[A](expr, path2)
+ case Path.AtItem(path2) => appendPath[A](expr, path2) // TODO: ?
+ case Path.AtMapKey(path2) => appendPath[A](expr, path2) // TODO: ?
+ case Path.AtMapValue(path2) => appendPath[A](expr, path2) // TODO: ?
  case _ => expr
  }
 

chimney/src/main/scala/io/scalaland/chimney/internal/runtime/Path.scala

@@ -5,4 +5,7 @@ object Path {
  final class Root extends Path
  final class Select[Init <: Path, FieldName <: String] extends Path
  final class Match[Init <: Path, Subtype] extends Path
+ final class EachItem[Init <: Path] extends Path
+ final class EachMapKey[Init <: Path] extends Path
+ final class EachMapValue[Init <: Path] extends Path
 }