Prefactor: Lay groundwork for compiling just plots

NetLogo · Nov 27, 2023 · f7bf406 · f7bf406
1 parent 48dc0e2
commit f7bf406
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 3 deletions.
diff --git a/compiler/shared/src/main/scala/CompiledModel.scala b/compiler/shared/src/main/scala/CompiledModel.scala
@@ -4,7 +4,7 @@ package org.nlogo.tortoise.compiler
 
 import
   org.nlogo.{ core, parse },
-    core.{ model, CompilerException, Model, View },
+    core.{ model, CompilerException, Model, Plot, View, Widget },
     model.ModelReader,
     parse.CompilerUtilities
 
@@ -61,10 +61,13 @@ object CompiledModel {
       CompiledModel(compiler.toJS(compilation), compilation, c)
   }
 
-  def fromNlogoContents(contents: String, compiler: Compiler)
+  def fromNlogoContents(contents: String, compiler: Compiler, extraWidgets: Seq[Widget] = Seq())
     (implicit compilerFlags: CompilerFlags): ValidationNel[Exception, CompiledModel] = {
     val validation =
-      try fromModel(ModelReader.parseModel(contents, CompilerUtilities, Map()), compiler)
+      try {
+        val model = ModelReader.parseModel(contents, CompilerUtilities, Map())
+        fromModel(model.copy(widgets = model.widgets ++ extraWidgets), compiler)
+      }
       catch {
         case e: RuntimeException => e.failureNel
       }
@@ -82,6 +85,19 @@ object CompiledModel {
     fromModel(model.copy(code = netlogoCode), compiler)
   }
 
+  def plotsToJS(plots: Seq[Plot], oldModel: CompiledModel)
+    (implicit compilerFlags: CompilerFlags): CompileResult[String] = {
+    val CompiledModel(_, compilation, compiler) = oldModel
+    val model                                   = compilation.model
+    validate(compiler) {
+      (c) =>
+        val nonPlots    = model.widgets.filterNot(_.isInstanceOf[Plot])
+        val newWidgets  = nonPlots ++ plots
+        val compilation = c.compileProcedures(model.copy(widgets = newWidgets))
+        compiler.plotsToJS(compilation.widgets)
+    }
+  }
+
   private def validate[T](compiler: Compiler)
     (compileFunc: (Compiler) => T): CompileResult[T] =
     try compileFunc(compiler).successNel

diff --git a/compiler/shared/src/main/scala/Compiler.scala b/compiler/shared/src/main/scala/Compiler.scala
@@ -90,6 +90,15 @@ class Compiler {
 
   }
 
+  def plotsToJS(widgets: Seq[CompiledWidget]): String = {
+    val globalModelConfig = JsStatement("global.modelConfig", Polyfills.content)
+    TortoiseLoader.integrateSymbols(
+         PlotCompiler.formatPlots(widgets)
+      :+ globalModelConfig
+      :+ resolveModelConfig
+    )
+  }
+
   def compileReporter(
     logo:          String,
     oldProcedures: ProceduresMap = NoProcedures,