Refine nested-path DSL error messages

chimney/src/main/scala-2/io/scalaland/chimney/internal/compiletime/dsl/utils/DslMacroUtils.scala

@@ -21,7 +21,7 @@
 
  private trait ExistentialType {
  type Underlying
  val Underlying: c.WeakTypeTag[Underlying]
  }
  private object ExistentialType {
 
@@ -60,7 +60,7 @@
  val Underlying: WeakTypeTag[runtime.Path.Root] = weakTypeTag[runtime.Path.Root]
  })
  // matches `_ => something unrelated` - not allowed
- case _: Ident => Left(ignoringInputNotAllowed(t))
+ case i: Ident => Left(ignoringInputNotAllowed(i, t))
  // matches `...()`
  case Apply(select @ Select(_, _), Nil) => unpackSelects(select)
  // matches `.matching[Subtype]`
@@ -172,22 +172,24 @@
  applyTypes(init.Underlying)
  }
  // matches `someFunctionName` - not allowed
- case Apply(_, _) => Left(arbitraryFunctionNotAllowed(t))
- case _ => Left(invalidSelectorErrorMessage(t))
+ case f @ Apply(_, _) => Left(arbitraryFunctionNotAllowed(f, t))
+ case _  => Left(invalidSelectorErrorMessage(t))
  }
 
  unpackSelects(selects)
  case _ => Left(invalidSelectorErrorMessage(t))
  }
 
- private def invalidSelectorErrorMessage(selectorTree: Tree): String =
- s"Invalid selector expression: $selectorTree"
+ import Console.*
 
- private def arbitraryFunctionNotAllowed(selectorTree: Tree): String =
- s"The path expression has to be a single chain of calls on the original input, operation other than value extraction: $selectorTree\n${showRaw(selectorTree)}"
+ private def invalidSelectorErrorMessage(t: Tree): String =
+ s"The path expression has to be a single chain of calls on the original input, got: $MAGENTA$t$RESET"
 
- private def ignoringInputNotAllowed(selectorTree: Tree): String =
- s"The path expression has to be a single chain of calls on the original input, got external identifier: $selectorTree"
+ private def arbitraryFunctionNotAllowed(f: Tree, t: Tree): String =
+ s"The path expression has to be a single chain of calls on the original input, got operation other than value extraction: $MAGENTA$f$RESET in $MAGENTA$t$RESET"
+
+ private def ignoringInputNotAllowed(i: Tree, t: Tree): String =
+ s"The path expression has to be a single chain of calls on the original input, got external identifier: $MAGENTA$i$RESET in: $MAGENTA$t$RESET"
  }
 
  private trait ExistentialCtor {
@@ -258,8 +260,10 @@
  )
  }
 
+ import Console.*
+
  private def invalidConstructor(t: Tree): String =
- s"Expected function, instead got: ${Console.MAGENTA}$t${Console.RESET}: ${Console.MAGENTA}${t.tpe}${Console.RESET}"
+ s"Expected function, instead got: $MAGENTA$t$RESET: $MAGENTA${t.tpe}$RESET"
  }
 
  // If we try to do:

chimney/src/main/scala-3/io/scalaland/chimney/internal/compiletime/dsl/utils/DslMacroUtils.scala

@@ -21,7 +21,7 @@
  private object IsOptionOf {
  def unapply(term: Term): Option[(ExistentialType, ExistentialType, ExistentialType)] = term.tpe.asType match {
  case '[runtime.IsOption.Of[o, sv, s]] => Some((ExistentialType[o], ExistentialType[sv], ExistentialType[s]))
  case _ => None
  }
  }
 
@@ -32,7 +32,7 @@
  term.tpe.asType match {
  case '[runtime.IsEither.Of[e, lv, rv, l, r]] =>
  Some((ExistentialType[e], ExistentialType[lv], ExistentialType[rv], ExistentialType[l], ExistentialType[r]))
  case _ => None
  }
  }
 
@@ -40,7 +40,7 @@
  def unapply(term: Term): Option[(ExistentialType, ExistentialType)] =
  term.tpe.asType match {
  case '[runtime.IsCollection.Of[c, a]] => Some((ExistentialType[c], ExistentialType[a]))
  case _ => None
  }
  }
 
@@ -48,7 +48,7 @@
  def unapply(term: Term): Option[(ExistentialType, ExistentialType, ExistentialType)] =
  term.tpe.asType match {
  case '[runtime.IsMap.Of[m, k, v]] => Some((ExistentialType[m], ExistentialType[k], ExistentialType[v]))
  case _ => None
  }
  }
 
@@ -95,7 +95,7 @@
  val Underlying: Type[runtime.Path.Root] = Type.of[runtime.Path.Root]
  })
  // matches `_ => something unrelated` - not allowed
- case _: Ident => Left(ignoringInputNotAllowed(t))
+ case i: Ident => Left(ignoringInputNotAllowed(i, t))
  // matches `.fieldName` AND `.fieldName()`
  case SelectLike(t2, fieldName) =>
  unpackSelects(t2).map { init =>
@@ -182,23 +182,26 @@
  }
  }
  // matches `someFunctionName` - not allowed
- case Apply(_, _) => Left(arbitraryFunctionNotAllowed(t))
- case _ => Left(invalidSelectorErrorMessage(t))
+ case f @ Apply(_, _) => Left(arbitraryFunctionNotAllowed(f, t))
+ case _  => Left(invalidSelectorErrorMessage(t))
  }
  unpackSelects(selects)
  case Inlined(_, _, block) => parse(block)
  case _ => Left(invalidSelectorErrorMessage(t))
  }
 
  private def invalidSelectorErrorMessage(t: Tree): String =
- s"Invalid selector expression: ${t.show(using Printer.TreeAnsiCode)}"
+ s"The path expression has to be a single chain of calls on the original input, got: ${t.show(using Printer.TreeAnsiCode)}"
 
- private def arbitraryFunctionNotAllowed(t: Tree): String =
- s"The path expression has to be a single chain of calls on the original input, operation other than value extraction: ${t
+ private def arbitraryFunctionNotAllowed(f: Tree, t: Tree): String =
+ s"The path expression has to be a single chain of calls on the original input, got operation other than value extraction: ${f
+ .show(using Printer.TreeAnsiCode)} in: ${t
  .show(using Printer.TreeAnsiCode)}"
 
- private def ignoringInputNotAllowed(t: Tree): String =
- s"The path expression has to be a single chain of calls on the original input, got external identifier: ${t.show(using Printer.TreeAnsiCode)}"
+ private def ignoringInputNotAllowed(i: Tree, t: Tree): String =
+ s"The path expression has to be a single chain of calls on the original input, got external identifier: ${i.show(
+ using Printer.TreeAnsiCode
+ )} in: ${t.show(using Printer.TreeAnsiCode)}"
  }
 
  private trait ExistentialCtor {

chimney/src/test/scala/io/scalaland/chimney/PartialTransformerProductSpec.scala

@@ -89,7 +89,7 @@ class PartialTransformerProductSpec extends ChimneySpec {
  import products.{Foo, Bar, HaveY}
 
  compileErrorsFixed("""Bar(3, (3.14, 3.14)).intoPartial[Foo].withFieldConst(_.y + "abc", "pi").transform""").check(
- "The path expression has to be a single chain of calls on the original input, operation other than value extraction:"
+ "The path expression has to be a single chain of calls on the original input, got operation other than value extraction:"
  )
 
  compileErrorsFixed(
@@ -242,7 +242,7 @@ class PartialTransformerProductSpec extends ChimneySpec {
  .transform
  """
  ).check(
- "The path expression has to be a single chain of calls on the original input, operation other than value extraction:"
+ "The path expression has to be a single chain of calls on the original input, got operation other than value extraction:"
  )
 
  compileErrorsFixed(
@@ -420,7 +420,7 @@ class PartialTransformerProductSpec extends ChimneySpec {
  Bar(3, (3.14, 3.14)).intoPartial[Foo].withFieldComputed(_.y + "abc", _.toString).transform
  """
  ).check(
- "The path expression has to be a single chain of calls on the original input, operation other than value extraction:"
+ "The path expression has to be a single chain of calls on the original input, got operation other than value extraction:"
  )
 
  compileErrorsFixed(
@@ -601,7 +601,7 @@ class PartialTransformerProductSpec extends ChimneySpec {
  Bar(3, (3.14, 3.14)).intoPartial[Foo].withFieldComputedPartial(_.y + "abc", _ => ???).transform
  """
  ).check(
- "The path expression has to be a single chain of calls on the original input, operation other than value extraction:"
+ "The path expression has to be a single chain of calls on the original input, got operation other than value extraction:"
  )
 
  compileErrorsFixed(
@@ -817,7 +817,7 @@ class PartialTransformerProductSpec extends ChimneySpec {
  User(1, "Kuba", Some(28)).intoPartial[UserPL].withFieldRenamed(_.age + "ABC", _.toString).transform
  """
  ).check(
- "The path expression has to be a single chain of calls on the original input, operation other than value extraction:"
+ "The path expression has to be a single chain of calls on the original input, got operation other than value extraction:"
  )
 
  compileErrorsFixed(

chimney/src/test/scala/io/scalaland/chimney/TotalTransformerProductSpec.scala

@@ -50,7 +50,7 @@ class TotalTransformerProductSpec extends ChimneySpec {
  import products.{Foo, Bar, HaveY}
 
  compileErrorsFixed("""Bar(3, (3.14, 3.14)).into[Foo].withFieldConst(_.y + "abc", "pi").transform""").check(
- "The path expression has to be a single chain of calls on the original input, operation other than value extraction:"
+ "The path expression has to be a single chain of calls on the original input, got operation other than value extraction:"
  )
 
  compileErrorsFixed(
@@ -148,7 +148,7 @@ class TotalTransformerProductSpec extends ChimneySpec {
 
  compileErrorsFixed("""Bar(3, (3.14, 3.14)).into[Foo].withFieldComputed(_.y + "abc", _.toString).transform""")
  .check(
- "The path expression has to be a single chain of calls on the original input, operation other than value extraction:"
+ "The path expression has to be a single chain of calls on the original input, got operation other than value extraction:"
  )
 
  compileErrorsFixed(
@@ -273,7 +273,7 @@ class TotalTransformerProductSpec extends ChimneySpec {
  compileErrorsFixed(
  """User(1, "Kuba", Some(28)).into[UserPL].withFieldRenamed(_.age + "ABC", _.toString).transform"""
  ).check(
- "The path expression has to be a single chain of calls on the original input, operation other than value extraction:"
+ "The path expression has to be a single chain of calls on the original input, got operation other than value extraction:"
  )
 
  compileErrorsFixed(