first migration step to 0.4

Author: julienrf

mindmap/aspects/build.sbt

@@ -1,23 +1,15 @@
 name := "mindmap-aspects"
 
 libraryDependencies ++= Seq(
-  "js-scala" %% "forest" % "0.4-SNAPSHOT",
-  "EPFL" %% "js-scala" % "0.3-SNAPSHOT",
+  "js-scala" %% "forest" % "0.5-SNAPSHOT",
+  "EPFL" %% "js-scala" % "0.4-SNAPSHOT",
   "EPFL" %% "lms" % "0.3-SNAPSHOT"
 )
 
-sourceGenerators in Compile <+= (sourceDirectory in Compile, sourceManaged in Compile) map { (sourceDir, targetDir) =>
-  forest.compiler.Compiler.compile(
-      scalax.file.Path(sourceDir / "forest" / "Templates"),
-      scalax.file.Path(targetDir),
-      Seq("models._", "scala.xml.Node", "scala.virtualization.lms.common._", "scala.js._"),
-      Seq("Models", "LiftJsScala")
-  )
-  (targetDir / "Templates.scala").get.map(_.getAbsoluteFile)
-}
-
 scalaOrganization := "org.scala-lang.virtualized"
 
-scalaVersion := "2.10.0"
+scalaVersion := "2.10.2-RC1"
+
+resolvers += Resolver.sonatypeRepo("snapshots")
 
 scalacOptions ++= Seq("-deprecation", "-unchecked", "-feature", "-Xexperimental", "-Yvirtualize")

mindmap/aspects/project/build.sbt

@@ -1,20 +1,21 @@
 
 import forest._
 import virtualization.lms.common._
-import js._
+import scala.js.exp.{JsScalaExp, JSExp}
+import scala.js.gen.js.{GenJsScala => JSGenJsScala, GenJS}
+import scala.js.gen.scala.{GenJsScala => ScalaGenJsScala}
 
 object CodeGenerator extends App {
 
-  trait Prog extends ir.Templates with views.Workspace with models.Models
+  trait Prog extends views.Workspace with models.Models
   val prog = new Prog with JsScalaExp with ForestExp { context = Nil }
-  val templates = new prog.Templates {}
-  val jsProg = new javascripts.BuildMap with models.Models with JSExp with ListOpsExp with StructExp { context = Nil }
+  val jsProg = new javascripts.BuildMap with models.Models with JSExp with StructExp { context = Nil }
   val jsProg2 = new javascripts.Exploration with JSExp with javascripts.ExtraJSExp { context = Nil }
 
   val scalaGen = new ScalaGenJsScala with ScalaGenForest { val IR: prog.type = prog; stream = null }
   val scalaOut = new java.io.PrintWriter("../app/MindMap-generated.scala")
   scalaOut.println("package generated {")
-  scalaGen.emitSource(templates.listMaps, "ListMaps", scalaOut)
+  scalaGen.emitSource(prog.listMaps, "ListMaps", scalaOut)
   scalaGen.emitSource(prog.showMap, "ShowMap", scalaOut)
   scalaGen.emitSource3(prog.MindMap, "MindMap", scalaOut)
   scalaGen.emitSource2(prog.MindMapR, "MindMapR", scalaOut)
@@ -44,17 +45,17 @@ object CodeGenerator extends App {
   scalaOut.close()
 
   val jsGen = new JSGenJsScala with JSGenForest { val IR: prog.type = prog; stream = null }
-  val jsGen2 = new JSGen with JSGenListOps with JSGenStruct {
+  val jsGen2 = new GenJS {
     val IR: jsProg.type = jsProg; stream = null
   }
-  val jsGen3 = new JSGen with javascripts.JSGenExtra { val IR: jsProg2.type = jsProg2; stream = null }
+  val jsGen3 = new GenJS with javascripts.JSGenExtra { val IR: jsProg2.type = jsProg2; stream = null }
   val jsOut = new java.io.PrintWriter("../app/assets/javascripts/mindmap-generated.js")
   jsOut.println(";window.MindMap = (function (m) {")
   jsOut.print("m['showMap'] = ")
   jsGen.emitSource(prog.showMap, "", jsOut)
   jsOut.println(";")
   jsOut.print("m['listMaps'] = ")
-  jsGen.emitSource(templates.listMaps, "", jsOut)
+  jsGen.emitSource(prog.listMaps, "", jsOut)
   jsOut.println(";")
   jsOut.print("m['buildMap'] = ")
   jsGen2.emitSource(jsProg.buildMap, "", jsOut)

mindmap/aspects/src/main/forest/Templates/itemMap.forest

@@ -2,7 +2,7 @@ package javascripts
 
 import models.Models
 import virtualization.lms.common._
-import js._
+import scala.js.language.JS
 
 trait BuildMap extends JS with Structs { this: Models =>
 

mindmap/aspects/src/main/forest/Templates/listMaps.forest

@@ -1,9 +1,5 @@
 package javascripts
 
-import scala.js._
-import models.Models
-import ir.Templates
-
 /*trait CreateMap extends JS with Models with Templates {
 	val main = fun { () =>
     val input = document.find(".form input")

mindmap/aspects/src/main/scala/CodeGenerator.scala

@@ -1,11 +1,16 @@
 package javascripts
 
 import virtualization.lms.common._
-import js._
+import scala.js.language._
+import scala.js.language.dom.Dom
+import scala.js.exp._
+import scala.js.exp.dom.DomExp
+import scala.js.gen.js._
+import scala.js.gen.js.dom.GenDom
 
 // Handle exploration of a mind map (zooming and moving)
 trait Exploration extends JS with ExtraJS {
-  type ViewState = JSLiteral { val s: Double; val tx: Double; val ty: Double }
+  type ViewState = Record { val s: Double; val tx: Double; val ty: Double }
 
   def setup(ps: Rep[Double], px: Rep[Double], py: Rep[Double], urlUpdate: Rep[((Double, Double, Double)) => String]) = for {
     workspace <- document.find(".workspace")
@@ -17,7 +22,7 @@ trait Exploration extends JS with ExtraJS {
     // Update url and svg transformation according to the current view state
     val updateTransform = fun { (scale: Rep[Double], translateX: Rep[Double], translateY: Rep[Double]) =>
       workspace.setAttribute("transform", "scale(" + scale / 100.0 + ") translate(" + translateX + " " + translateY + ")")
-      history.replaceState(new JSLiteral { val s = scale; val tx = translateX; val ty = translateY }, "", urlUpdate(scale, translateX, translateY))
+      history.replaceState(new Record { val s = scale; val tx = translateX; val ty = translateY }, "", urlUpdate(scale, translateX, translateY))
     }
 
     // History events
@@ -68,30 +73,30 @@ trait Exploration extends JS with ExtraJS {
 
 // --- Helper to integrate external API
 
-trait ExternApi { this: Base with JSProxyBase =>
+trait ExternApi { this: Base with Proxy =>
   import language.{higherKinds, implicitConversions}
   type Extern[A] <: Rep[A]
   implicit def externToApi[A <: AnyRef : Manifest](f: Extern[A]): A = repProxy[A](f) // Han, all function calls will be considered effectful…
 }
 
-trait ExternApiExp extends ExternApi { this: BaseExp with JSProxyExp =>
+trait ExternApiExp extends ExternApi { this: BaseExp with ProxyExp =>
   abstract class Extern[A : Manifest] extends Exp[A]
 }
 
 // --- Math JavaScript standard API
 
-trait JSMath { this: Base with ExternApi with JSProxyBase =>
+trait JSMath { this: Base with ExternApi with Proxy =>
   trait Math {
     def round(x: Rep[Double]): Rep[Double]
   }
   val Math: Extern[Math]
 }
 
-trait JSMathExp extends JSMath { this: BaseExp with ExternApiExp with JSProxyExp =>
+trait JSMathExp extends JSMath { this: BaseExp with ExternApiExp with ProxyExp =>
   object Math extends Extern[Math]
 }
 
-trait JSGenMath extends JSGenBase {
+trait JSGenMath extends GenBase {
   val IR: BaseExp with JSMath
   import IR._
 
@@ -101,8 +106,8 @@ trait JSGenMath extends JSGenBase {
   }
 }
 
-trait ExtraJS extends JSMath with JSDom with OptionOps with ExternApi with JSProxyBase with Casts with LiftVariables with Variables
-trait ExtraJSExp extends JSMathExp with JSDomExp with OptionOpsExp with ExternApiExp with JSProxyExp with CastsCheckedExp
-trait JSGenExtra extends JSGenMath with JSGenDom with JSGenOptionOps with JSGenProxy with GenCastChecked {
+trait ExtraJS extends JSMath with Dom with OptionOps with ExternApi with Proxy with Casts with LiftVariables with Variables
+trait ExtraJSExp extends JSMathExp with DomExp with OptionOpsExp with ExternApiExp with ProxyExp with CastsCheckedExp
+trait JSGenExtra extends JSGenMath with GenDom with GenOptionOps with GenProxy with GenCastChecked {
   val IR: ExtraJSExp
 }

mindmap/aspects/src/main/scala/javascripts/BuildMap.scala

@@ -4,9 +4,20 @@ import forest._
 import scala.xml.Node
 import scala.virtualization.lms.common._
 import models._
-import scala.js._
+import scala.js.language.JsScala
 
-trait Workspace extends JsScala with Forest with LiftJsScala { this: Models =>
+trait Workspace extends JsScala with Forest { this: Models =>
+
+  def itemMap(map: Rep[MindMapR]) =
+    el('li)(
+      el('a, 'href -> ("/" + map.id))(map.content.name)
+    )
+
+  def listMaps(maps: Rep[List[MindMapR]]) =
+    el('div, 'class -> "list-maps")(
+      el('ul)(for (map <- maps) yield itemMap(map)),
+      el('p)("Create a", el('strong)(" new mind map"), ":", el('input, 'type -> 'text, 'placeholder -> "Name")())
+    )
 
   def showMap(map: Rep[MindMap]): Rep[List[Node]] = {
     val defs = el('defs)(