fix toString with quoted escape for Ent and StrAttr, add types implementation

Author: bjornregnell

src/main/scala/02-meta-model.scala

@@ -252,6 +252,8 @@ object meta:
       s"|  infix def $name(sub: Elem*): Rel = Rel(e, ${name.capitalize}, Model(sub*))\n" +
       s"|  infix def $name: Link = Link(e, ${name.capitalize})\n"
 
+    def dollar(s: String) = "${" + s + "}"
+
     s"""|//--- THIS IS A GENERATED FILE! DO NOT EDIT AS CHANGES ARE LOST ON RE-GENERATION 
         |//--- Edit the code below by changing `def generate` in reqt.meta
         |//--- Generate this file in sbt> `meta`
@@ -292,7 +294,8 @@ object meta:
         |
         |final case class Link(e: Ent, t: RelType)
         |
-        |final case class Ent private (t: EntType, id: String) extends Node
+        |final case class Ent private (t: EntType, id: String) extends Node:
+        |  override def toString = s"Ent(${dollar("t")},${dollar("id.quotedEscaped")})"
         |object Ent:
         |  val emptyId = "???"
         |  def apply(t: EntType, id: String): Ent = 
@@ -304,13 +307,14 @@ object meta:
         |  def t: AttrType[T]
         |  def value: T
         |
-        |final case class StrAttr(t: StrAttrType, value: String) extends Attr[String]
+        |final case class StrAttr(t: StrAttrType, value: String) extends Attr[String]:
+        |  override def toString = s"StrAttr(${dollar("t")},${dollar("value.quotedEscaped")})"
         |case object StrAttr extends meta.ConceptGroup:
-        |  def types: Seq[StrAttrType] = ???
+        |  def types: Seq[StrAttrType] = meta.strAttrTypes.values.toSeq
         |
         |final case class IntAttr(t: IntAttrType, value: Int) extends Attr[Int]
         |case object IntAttr extends meta.ConceptGroup:
-        |  def types: Seq[IntAttrType] = ???
+        |  def types: Seq[IntAttrType] = meta.intAttrTypes.values.toSeq
         |
         |final case class Undefined[T](t: AttrType[T]) extends Attr[T]:
         |  def value: T = throw new java.util.NoSuchElementException

src/main/scala/03-model-GENERATED.scala

@@ -38,7 +38,8 @@ sealed trait AttrType[T] extends NodeType:
 
 final case class Link(e: Ent, t: RelType)
 
-final case class Ent private (t: EntType, id: String) extends Node
+final case class Ent private (t: EntType, id: String) extends Node:
+  override def toString = s"Ent(${t},${id.quotedEscaped})"
 object Ent:
   val emptyId = "???"
   def apply(t: EntType, id: String): Ent = 
@@ -50,13 +51,14 @@ sealed trait Attr[T] extends Node:
   def t: AttrType[T]
   def value: T
 
-final case class StrAttr(t: StrAttrType, value: String) extends Attr[String]
+final case class StrAttr(t: StrAttrType, value: String) extends Attr[String]:
+  override def toString = s"StrAttr(${t},${value.quotedEscaped})"
 case object StrAttr extends meta.ConceptGroup:
-  def types: Seq[StrAttrType] = ???
+  def types: Seq[StrAttrType] = meta.strAttrTypes.values.toSeq
 
 final case class IntAttr(t: IntAttrType, value: Int) extends Attr[Int]
 case object IntAttr extends meta.ConceptGroup:
-  def types: Seq[IntAttrType] = ???
+  def types: Seq[IntAttrType] = meta.intAttrTypes.values.toSeq
 
 final case class Undefined[T](t: AttrType[T]) extends Attr[T]:
   def value: T = throw new java.util.NoSuchElementException

src/main/scala/04-ModelMembers.scala

@@ -151,37 +151,57 @@ transparent trait ModelMembers:
 
   /** Remove all elems in es using remove. Same as m.removeAll(e1, e2, e3) */
   def --(es: Elem*): Model = removeAll(es*)
-
+  
+  /** All entities and attributes in this model. */
   def nodes: Vector[Node] = elems.flatMap:
     case n: Node => Vector(n) 
     case Rel(e, r, m) => Vector(e) ++ m.nodes
 
+  /** All relation links in of this model. */
   def links: Vector[Link] = elems.flatMap:
     case _: Node => Vector() 
     case Rel(e, r, m) => Vector(Link(e,r)) ++ m.links
 
+  /** All relation types in of this model. */
   def relTypes: Vector[RelType] = links.map(_.t)
 
+  /** All relations of this model. */
   def rels: Vector[Rel] = elems.flatMap:
     case _: Node => Vector() 
     case r@Rel(_, _, m) => Vector(r) ++ m.rels
 
-
+  /** All undefined attributes of this model. */
   def undefined: Vector[Undefined[?]] = nodes.collect{ case u: Undefined[?] => u }
 
+  /** All entities of this model. */
   def ents: Vector[Ent]         = nodes.collect { case e: Ent => e }
+
+  /** All entities of this model. */
   def entTypes: Vector[EntType] = nodes.collect { case e: Ent => e.t }
+
+  /** All attributes of this model. */
   def attrs: Vector[Attr[?]]    = nodes.collect { case a: Attr[?] => a }
+
+  /** All string attributes of this model. */
   def strAttrs: Vector[StrAttr] = nodes.collect { case a: StrAttr => a }
+
+  /** All string values of this model. */
   def strValues: Vector[String] = nodes.collect { case a: StrAttr => a.value }
+
+  /** All integer attributes of this model. */
   def intAttrs: Vector[IntAttr] = nodes.collect { case a: IntAttr => a }
+
+  /** All integer attribute values of this model. */
   def intValues: Vector[Int]    = nodes.collect { case a: IntAttr => a.value }
 
+  /** All entity ids of this model. */
   lazy val ids: Vector[String] = ents.map(_.id)
 
+  /** A Map from entity id to a Set of entity types of all entity ids of this model. */
   lazy val idTypeMap: Map[String, Set[EntType]] = 
     ents.groupBy(_.id).map((id, xs) => id -> xs.map(_.t).toSet)
 
+  /** A Map from entity id to a Vector of all entities with that id. */
   lazy val idMap: Map[String, Vector[Ent]] = 
     ents.groupBy(_.id).map((id, xs) => id -> xs.toVector)