diff options
Diffstat (limited to 'dottydoc/js/src/EntityIndex.scala')
| -rw-r--r-- | dottydoc/js/src/EntityIndex.scala | 35 |
1 files changed, 15 insertions, 20 deletions
diff --git a/dottydoc/js/src/EntityIndex.scala b/dottydoc/js/src/EntityIndex.scala index e58cdf88e..b6fe1842f 100644 --- a/dottydoc/js/src/EntityIndex.scala +++ b/dottydoc/js/src/EntityIndex.scala @@ -1,35 +1,30 @@ -package dotty.tools.dottydoc +package dotty.tools +package dottydoc package js -import scala.scalajs.js -import js.Dynamic.global -import js.JSApp -import js.annotation.JSName +import scala.scalajs.{ js => sjs } +import sjs.JSConverters._ +import sjs.Dynamic.global +import sjs.JSApp +import sjs.annotation.JSName /** The unpickled AST available as scala classes */ object EntityIndex { - import microjson._ import prickle._ - import model._ - import model.pickling._ + import dottydoc.model.pickling._ + import js.model._ lazy val packages: Map[String, Package] = - //FIXME - //Unpickle[Map[String, Package]] - //.fromString(js.JSON.stringify(Unparsed.packages)) - //.from[js.Object](Unparsed.packages) - //.toOption - None - .getOrElse(Map.empty) + Unparsed.packages.toMap[String, Package] - val currentEntity: Entity = Unpickle[Entity] - .fromString(js.JSON.stringify(Unparsed.currentEntity)) + val currentEntity: dottydoc.model.Entity = Unpickle[dottydoc.model.Entity] + .fromString(sjs.JSON.stringify(Unparsed.currentEntity)) .toOption .get /** Unparsed index stores the pickled AST generated by the dottydoc tool */ - @js.native @JSName("UnparsedIndex") private object Unparsed extends js.Object { - def packages: js.Object = js.native - def currentEntity: js.Object = js.native + @sjs.native @JSName("UnparsedIndex") private object Unparsed extends sjs.Object { + def packages: sjs.Dictionary[Package] = sjs.native + def currentEntity: sjs.Object = sjs.native } } |