remove some wrapper classes

Author: bishabosha

scalasql/namedtuples/src/SimpleTableMacros.scala

@@ -27,14 +27,11 @@ object SimpleTableMacros {
   )[U: ClassTag](f: (T, Int) => IterableOnce[U]): IArray[U] = {
     IArray.from(t.productIterator.asInstanceOf[Iterator[T]].zipWithIndex.flatMap(f.tupled))
   }
-  def asIArrayUnwrap[T](t: Tuple)[U: ClassTag](f: T => U): IArray[U] = {
-    IArray.from(t.productIterator.asInstanceOf[Iterator[T]].map(f))
-  }
   def unwrapLabels(t: Tuple, labels: IArray[String]): IndexedSeq[String] = {
-    asIArrayFlatUnwrapWithIndex[BaseLabels[?, ?]](t)((l, i) => l.fetch(labels(i))).toIndexedSeq
+    asIArrayFlatUnwrapWithIndex[BaseLabels[Any, Any]](t)((l, i) => l(labels(i))).toIndexedSeq
   }
   def unwrapColumns(t: Tuple): IArray[AnyRef] = {
-    asIArrayUnwrap[BaseColumn[?, ?]](t)(_.value)
+    asIArray[BaseColumn[Any, Any]](t)
   }
   def make[C](m: Mirror.ProductOf[C], data: IArray[AnyRef]): C = {
     class ArrayProduct extends Product {
@@ -51,10 +48,10 @@ object SimpleTableMacros {
       mappers: DialectTypeMappers,
       tableRef: TableRef
   ): IArray[AnyRef] = {
-    val cols = mappers match
-      case given DialectTypeMappers =>
-        tableRef match
-          case given TableRef => compiletime.summonAll[Columns]
+    val cols = tableRef match
+      case given TableRef =>
+        import mappers.given
+        compiletime.summonAll[Columns]
     unwrapColumns(cols)
   }
 
@@ -87,32 +84,32 @@ object SimpleTableMacros {
     ): BaseRowExpr[T] = delegate
   }
 
-  class BaseColumn[L, T](val value: AnyRef)
+  opaque type BaseColumn[L, T] = AnyRef
   trait BaseColumnLowPrio {
-    inline given notFound: [L <: String, T]
-      => (l: ValueOf[L], mappers: DialectTypeMappers, ref: TableRef) => BaseColumn[L, T] =
-      import mappers.{*, given}
+    given notFound: [L <: String, T]
+      => (l: ValueOf[L], ref: TableRef, mapper: TypeMapper[T])
+      => BaseColumn[L, T] =
       val col = new Column[T](
         ref,
         Table.columnNameOverride(ref.value)(l.value)
-      )(using compiletime.summonInline[TypeMapper[T]])
-      BaseColumn(col)
+      )
+      col
   }
   object BaseColumn extends BaseColumnLowPrio {
     given foundMeta: [L <: String, T]
       => (mappers: DialectTypeMappers, ref: TableRef, m: SimpleTable.WrappedMetadata[T])
       => BaseColumn[L, T] =
-      BaseColumn(m.metadata.metadata0.vExpr(ref, mappers).asInstanceOf[AnyRef])
+      m.metadata.metadata0.vExpr(ref, mappers).asInstanceOf[AnyRef]
   }
 
-  class BaseLabels[L, C](val fetch: String => Seq[String])
+  opaque type BaseLabels[L, C] = String => Seq[String]
   trait BaseLabelsLowPrio {
     given notFound: [L <: String, C] => BaseLabels[L, C] =
-      new BaseLabels(fetch = label => Seq(label))
+      label => Seq(label)
   }
   object BaseLabels extends BaseLabelsLowPrio {
     given foundMeta: [L, C] => (m: SimpleTable.WrappedMetadata[C]) => BaseLabels[L, C] =
-      new BaseLabels(fetch = _ => m.metadata.metadata0.walkLabels0())
+      _ => m.metadata.metadata0.walkLabels0()
   }
 
   def setNonNull[T](r: AtomicReference[T | Null])(f: => T): T = {