Made Tyrian-Tags, Tyrian module now JS only

PurpleKingdomGames · Apr 11, 2024 · f7b5753 · f7b5753
1 parent aab783f
commit f7b5753
Show file tree

Hide file tree

Showing 53 changed files with 71 additions and 51 deletions.
diff --git a/build.sbt b/build.sbt
@@ -120,8 +120,9 @@ lazy val tyrianProject =
       logoSettings(version)
     )
     .aggregate(
+      tyrianTags.js,
+      tyrianTags.jvm,
       tyrian.js,
-      tyrian.jvm,
       tyrianIO.js,
       tyrianZIO.js,
       sandbox.js,
@@ -134,16 +135,32 @@ lazy val tyrianProject =
       sandboxSSR.jvm
     )
 
-lazy val tyrian =
+lazy val tyrianTags =
   crossProject(JSPlatform, JVMPlatform)
     .crossType(CrossType.Full)
+    .in(file("tyrian-tags"))
     .settings(
-      name := "tyrian",
+      name := "tyrian-tags",
       commonSettings ++ publishSettings,
       Compile / sourceGenerators += codeGen("tyrian", TagGen.gen).taskValue,
       Compile / sourceGenerators += codeGen("tyrian", AttributeGen.gen).taskValue,
       Compile / sourceGenerators += codeGen("CSS", "tyrian", CSSGen.gen).taskValue
     )
+    .jsSettings(
+      commonJsSettings,
+      libraryDependencies ++= Seq(
+        "org.scala-js" %%% "scalajs-dom" % Dependencies.scalajsDomVersion
+      )
+    )
+
+lazy val tyrian =
+  crossProject(JSPlatform)
+    .crossType(CrossType.Pure)
+    .withoutSuffixFor(JSPlatform)
+    .settings(
+      name := "tyrian",
+      commonSettings ++ publishSettings
+    )
     .jsSettings(
       commonJsSettings,
       libraryDependencies ++= Seq(
@@ -152,6 +169,7 @@ lazy val tyrian =
         "io.github.buntec" %%% "scala-js-snabbdom"  % Dependencies.scalajsSnabbdom
       )
     )
+    .dependsOn(tyrianTags)
 
 lazy val tyrianIO =
   crossProject(JSPlatform)
@@ -223,7 +241,7 @@ lazy val sandboxZIO =
 lazy val sandboxSSR =
   crossProject(JVMPlatform)
     .crossType(CrossType.Pure)
-    .dependsOn(tyrian, tyrianHtmx)
+    .dependsOn(tyrianTags, tyrianHtmx)
     .in(file("sandbox-ssr"))
     .settings(
       neverPublish,
@@ -244,7 +262,6 @@ lazy val unidocs =
       name := "Tyrian",
       neverPublish,
       ScalaUnidoc / unidoc / unidocProjectFilter := inAnyProject -- inProjects(
-        tyrian.jvm,
         sandboxZIO.js,
         sandbox.js,
         docs,
@@ -344,7 +361,7 @@ lazy val tyrianHtmx =
     .jsSettings(
       commonJsSettings
     )
-    .dependsOn(tyrian)
+    .dependsOn(tyrianTags)
 
 addCommandAlias(
   "sandboxBuild",

diff --git a/.../main/scala/tyrian/LocationPlatform.scala → .../main/scala/tyrian/LocationPlatform.scala b/.../main/scala/tyrian/LocationPlatform.scala → .../main/scala/tyrian/LocationPlatform.scala
diff --git a/tyrian-tags/js/src/main/scala/tyrian/Tyrian.scala b/tyrian-tags/js/src/main/scala/tyrian/Tyrian.scala
@@ -0,0 +1,8 @@
+package tyrian
+
+object Tyrian:
+
+  type Event            = org.scalajs.dom.Event
+  type KeyboardEvent    = org.scalajs.dom.KeyboardEvent
+  type MouseEvent       = org.scalajs.dom.MouseEvent
+  type HTMLInputElement = org.scalajs.dom.HTMLInputElement
diff --git a/tyrian-tags/js/src/main/scala/tyrian/syntax.scala b/tyrian-tags/js/src/main/scala/tyrian/syntax.scala
@@ -0,0 +1,5 @@
+package tyrian
+
+object syntax:
+
+  extension [M](oa: Option[Elem[M]]) def orEmpty: Elem[M] = oa.getOrElse(tyrian.Empty)
diff --git a/.../main/scala/tyrian/LocationPlatform.scala → .../main/scala/tyrian/LocationPlatform.scala b/.../main/scala/tyrian/LocationPlatform.scala → .../main/scala/tyrian/LocationPlatform.scala
@@ -1,3 +1,4 @@
 package tyrian
 
 trait LocationPlatform
+
diff --git a/...an/jvm/src/main/scala/tyrian/Tyrian.scala → ...gs/jvm/src/main/scala/tyrian/Tyrian.scala b/...an/jvm/src/main/scala/tyrian/Tyrian.scala → ...gs/jvm/src/main/scala/tyrian/Tyrian.scala
diff --git a/...n/shared/src/main/scala/tyrian/Attr.scala → ...s/shared/src/main/scala/tyrian/Attr.scala b/...n/shared/src/main/scala/tyrian/Attr.scala → ...s/shared/src/main/scala/tyrian/Attr.scala
diff --git a/...src/main/scala/tyrian/HTMLRendering.scala → ...src/main/scala/tyrian/HTMLRendering.scala b/...src/main/scala/tyrian/HTMLRendering.scala → ...src/main/scala/tyrian/HTMLRendering.scala
diff --git a/...n/shared/src/main/scala/tyrian/Html.scala → ...s/shared/src/main/scala/tyrian/Html.scala b/...n/shared/src/main/scala/tyrian/Html.scala → ...s/shared/src/main/scala/tyrian/Html.scala
diff --git a/...ared/src/main/scala/tyrian/Location.scala → ...ared/src/main/scala/tyrian/Location.scala b/...ared/src/main/scala/tyrian/Location.scala → ...ared/src/main/scala/tyrian/Location.scala
diff --git a/...c/main/scala/tyrian/LocationDetails.scala → ...c/main/scala/tyrian/LocationDetails.scala b/...c/main/scala/tyrian/LocationDetails.scala → ...c/main/scala/tyrian/LocationDetails.scala
diff --git a/.../shared/src/main/scala/tyrian/Style.scala → .../shared/src/main/scala/tyrian/Style.scala b/.../shared/src/main/scala/tyrian/Style.scala → .../shared/src/main/scala/tyrian/Style.scala
diff --git a/.../js/src/test/scala/tyrian/AttrTests.scala → ...red/src/test/scala/tyrian/AttrTests.scala b/.../js/src/test/scala/tyrian/AttrTests.scala → ...red/src/test/scala/tyrian/AttrTests.scala
diff --git a/...est/scala/tyrian/HTMLRenderingTests.scala → ...est/scala/tyrian/HTMLRenderingTests.scala b/...est/scala/tyrian/HTMLRenderingTests.scala → ...est/scala/tyrian/HTMLRenderingTests.scala
diff --git a/.../js/src/test/scala/tyrian/HtmlTests.scala → ...red/src/test/scala/tyrian/HtmlTests.scala b/.../js/src/test/scala/tyrian/HtmlTests.scala → ...red/src/test/scala/tyrian/HtmlTests.scala
diff --git a/...t/scala/tyrian/LocationDetailsTests.scala → ...t/scala/tyrian/LocationDetailsTests.scala b/...t/scala/tyrian/LocationDetailsTests.scala → ...t/scala/tyrian/LocationDetailsTests.scala
diff --git a/...src/test/scala/tyrian/LocationTests.scala → ...src/test/scala/tyrian/LocationTests.scala b/...src/test/scala/tyrian/LocationTests.scala → ...src/test/scala/tyrian/LocationTests.scala
diff --git a/...ed/src/test/scala/tyrian/StyleTests.scala → ...ed/src/test/scala/tyrian/StyleTests.scala b/...ed/src/test/scala/tyrian/StyleTests.scala → ...ed/src/test/scala/tyrian/StyleTests.scala
diff --git a/tyrian/js/src/main/scala/tyrian/Tyrian.scala b/tyrian/js/src/main/scala/tyrian/Tyrian.scala
diff --git a/tyrian/js/src/main/scala/tyrian/Cmd.scala → tyrian/src/main/scala/tyrian/Cmd.scala b/tyrian/js/src/main/scala/tyrian/Cmd.scala → tyrian/src/main/scala/tyrian/Cmd.scala
diff --git a/.../js/src/main/scala/tyrian/HotReload.scala → tyrian/src/main/scala/tyrian/HotReload.scala b/.../js/src/main/scala/tyrian/HotReload.scala → tyrian/src/main/scala/tyrian/HotReload.scala
diff --git a/tyrian/js/src/main/scala/tyrian/Nav.scala → tyrian/src/main/scala/tyrian/Nav.scala b/tyrian/js/src/main/scala/tyrian/Nav.scala → tyrian/src/main/scala/tyrian/Nav.scala
diff --git a/...an/js/src/main/scala/tyrian/Routing.scala → tyrian/src/main/scala/tyrian/Routing.scala b/...an/js/src/main/scala/tyrian/Routing.scala → tyrian/src/main/scala/tyrian/Routing.scala
diff --git a/tyrian/js/src/main/scala/tyrian/Sub.scala → tyrian/src/main/scala/tyrian/Sub.scala b/tyrian/js/src/main/scala/tyrian/Sub.scala → tyrian/src/main/scala/tyrian/Sub.scala
diff --git a/...js/src/main/scala/tyrian/TyrianAppF.scala → ...an/src/main/scala/tyrian/TyrianAppF.scala b/...js/src/main/scala/tyrian/TyrianAppF.scala → ...an/src/main/scala/tyrian/TyrianAppF.scala
@@ -6,6 +6,7 @@ import org.scalajs.dom.Element
 import org.scalajs.dom.HTMLElement
 import org.scalajs.dom.document
 import org.scalajs.dom.window
+import tyrian.runtime.TyrianRuntime
 
 import scala.annotation.nowarn
 import scala.scalajs.js.Promise
@@ -110,7 +111,7 @@ trait TyrianAppF[F[_]: Async, Msg, Model]:
 
   def ready(node: Element, flags: Map[String, String]): Unit =
     run(
-      Tyrian.start[F, Model, Msg](
+      TyrianAppF.start[F, Model, Msg](
         node,
         router,
         _init(flags),
@@ -165,3 +166,35 @@ object TyrianAppF:
       case (dataAttr, attrValue) if dataAttr.startsWith("tyrianFlag") =>
         dataAttr.replaceFirst("^tyrianFlag", "") -> attrValue
     }.toMap
+
+  /** Directly starts the app. Computes the initial state of the given application, renders it on the given DOM element,
+    * and listens to user actions
+    * @param init
+    *   initial state
+    * @param update
+    *   state transition function
+    * @param view
+    *   view function
+    * @param subscriptions
+    *   subscriptions function
+    * @param node
+    *   the DOM element to mount the app to
+    * @param runner
+    *   the function that runs the program. Has a type of `F[Option[Msg]] => (Either[Throwable, Option[Msg]] => Unit) =>
+    *   Unit`, essentially: `task.unsafeRunAsync(callback)`
+    * @tparam F
+    *   The effect type to use, e.g. `IO`
+    * @tparam Model
+    *   Type of model
+    * @tparam Msg
+    *   Type of messages
+    */
+  def start[F[_]: Async, Model, Msg](
+      node: Element,
+      router: Location => Msg,
+      init: (Model, Cmd[F, Msg]),
+      update: Model => Msg => (Model, Cmd[F, Msg]),
+      view: Model => Html[Msg],
+      subscriptions: Model => Sub[F, Msg]
+  ): F[Nothing] =
+    TyrianRuntime[F, Model, Msg](router, node, init._1, init._2, update, view, subscriptions)
diff --git a/...n/js/src/main/scala/tyrian/cmds/Dom.scala → tyrian/src/main/scala/tyrian/cmds/Dom.scala b/...n/js/src/main/scala/tyrian/cmds/Dom.scala → tyrian/src/main/scala/tyrian/cmds/Dom.scala
diff --git a/...src/main/scala/tyrian/cmds/Download.scala → ...src/main/scala/tyrian/cmds/Download.scala b/...src/main/scala/tyrian/cmds/Download.scala → ...src/main/scala/tyrian/cmds/Download.scala
diff --git a/.../js/src/main/scala/tyrian/cmds/File.scala → tyrian/src/main/scala/tyrian/cmds/File.scala b/.../js/src/main/scala/tyrian/cmds/File.scala → tyrian/src/main/scala/tyrian/cmds/File.scala
diff --git a/...c/main/scala/tyrian/cmds/FileReader.scala → ...c/main/scala/tyrian/cmds/FileReader.scala b/...c/main/scala/tyrian/cmds/FileReader.scala → ...c/main/scala/tyrian/cmds/FileReader.scala
diff --git a/.../main/scala/tyrian/cmds/ImageLoader.scala → .../main/scala/tyrian/cmds/ImageLoader.scala b/.../main/scala/tyrian/cmds/ImageLoader.scala → .../main/scala/tyrian/cmds/ImageLoader.scala
diff --git a/...main/scala/tyrian/cmds/LocalStorage.scala → ...main/scala/tyrian/cmds/LocalStorage.scala b/...main/scala/tyrian/cmds/LocalStorage.scala → ...main/scala/tyrian/cmds/LocalStorage.scala
diff --git a/...s/src/main/scala/tyrian/cmds/Logger.scala → ...n/src/main/scala/tyrian/cmds/Logger.scala b/...s/src/main/scala/tyrian/cmds/Logger.scala → ...n/src/main/scala/tyrian/cmds/Logger.scala
diff --git a/...s/src/main/scala/tyrian/cmds/Random.scala → ...n/src/main/scala/tyrian/cmds/Random.scala b/...s/src/main/scala/tyrian/cmds/Random.scala → ...n/src/main/scala/tyrian/cmds/Random.scala
diff --git a/.../src/main/scala/tyrian/http/Decoder.scala → .../src/main/scala/tyrian/http/Decoder.scala b/.../src/main/scala/tyrian/http/Decoder.scala → .../src/main/scala/tyrian/http/Decoder.scala
diff --git a/.../js/src/main/scala/tyrian/http/Http.scala → tyrian/src/main/scala/tyrian/http/Http.scala b/.../js/src/main/scala/tyrian/http/Http.scala → tyrian/src/main/scala/tyrian/http/Http.scala
diff --git a/...s/src/main/scala/tyrian/http/Models.scala → ...n/src/main/scala/tyrian/http/Models.scala b/...s/src/main/scala/tyrian/http/Models.scala → ...n/src/main/scala/tyrian/http/Models.scala
diff --git a/.../src/main/scala/tyrian/http/Request.scala → .../src/main/scala/tyrian/http/Request.scala b/.../src/main/scala/tyrian/http/Request.scala → .../src/main/scala/tyrian/http/Request.scala
diff --git a/...main/scala/tyrian/runtime/CmdHelper.scala → ...main/scala/tyrian/runtime/CmdHelper.scala b/...main/scala/tyrian/runtime/CmdHelper.scala → ...main/scala/tyrian/runtime/CmdHelper.scala
diff --git a/.../main/scala/tyrian/runtime/Renderer.scala → .../main/scala/tyrian/runtime/Renderer.scala b/.../main/scala/tyrian/runtime/Renderer.scala → .../main/scala/tyrian/runtime/Renderer.scala
diff --git a/.../scala/tyrian/runtime/RendererState.scala → .../scala/tyrian/runtime/RendererState.scala b/.../scala/tyrian/runtime/RendererState.scala → .../scala/tyrian/runtime/RendererState.scala
diff --git a/...main/scala/tyrian/runtime/Rendering.scala → ...main/scala/tyrian/runtime/Rendering.scala b/...main/scala/tyrian/runtime/Rendering.scala → ...main/scala/tyrian/runtime/Rendering.scala
diff --git a/...main/scala/tyrian/runtime/SubHelper.scala → ...main/scala/tyrian/runtime/SubHelper.scala b/...main/scala/tyrian/runtime/SubHelper.scala → ...main/scala/tyrian/runtime/SubHelper.scala
diff --git a/.../scala/tyrian/runtime/TyrianRuntime.scala → .../scala/tyrian/runtime/TyrianRuntime.scala b/.../scala/tyrian/runtime/TyrianRuntime.scala → .../scala/tyrian/runtime/TyrianRuntime.scala
diff --git a/tyrian/js/src/main/scala/tyrian/syntax.scala → tyrian/src/main/scala/tyrian/syntax.scala b/tyrian/js/src/main/scala/tyrian/syntax.scala → tyrian/src/main/scala/tyrian/syntax.scala
diff --git a/...in/scala/tyrian/websocket/WebSocket.scala → ...in/scala/tyrian/websocket/WebSocket.scala b/...in/scala/tyrian/websocket/WebSocket.scala → ...in/scala/tyrian/websocket/WebSocket.scala
diff --git a/...ala/tyrian/websocket/WebSocketEvent.scala → ...ala/tyrian/websocket/WebSocketEvent.scala b/...ala/tyrian/websocket/WebSocketEvent.scala → ...ala/tyrian/websocket/WebSocketEvent.scala
diff --git a/...an/js/src/main/scala/util/Functions.scala → tyrian/src/main/scala/util/Functions.scala b/...an/js/src/main/scala/util/Functions.scala → tyrian/src/main/scala/util/Functions.scala
diff --git a/...s/src/test/scala/tyrian/CmdLawsTest.scala → ...n/src/test/scala/tyrian/CmdLawsTest.scala b/...s/src/test/scala/tyrian/CmdLawsTest.scala → ...n/src/test/scala/tyrian/CmdLawsTest.scala
diff --git a/...s/src/test/scala/tyrian/CmdSubUtils.scala → ...n/src/test/scala/tyrian/CmdSubUtils.scala b/...s/src/test/scala/tyrian/CmdSubUtils.scala → ...n/src/test/scala/tyrian/CmdSubUtils.scala
diff --git a/...n/js/src/test/scala/tyrian/CmdTests.scala → tyrian/src/test/scala/tyrian/CmdTests.scala b/...n/js/src/test/scala/tyrian/CmdTests.scala → tyrian/src/test/scala/tyrian/CmdTests.scala
diff --git a/...s/src/test/scala/tyrian/SubLawsTest.scala → ...n/src/test/scala/tyrian/SubLawsTest.scala b/...s/src/test/scala/tyrian/SubLawsTest.scala → ...n/src/test/scala/tyrian/SubLawsTest.scala
diff --git a/...n/js/src/test/scala/tyrian/SubTests.scala → tyrian/src/test/scala/tyrian/SubTests.scala b/...n/js/src/test/scala/tyrian/SubTests.scala → tyrian/src/test/scala/tyrian/SubTests.scala
diff --git a/.../test/scala/tyrian/cmds/RandomTests.scala → .../test/scala/tyrian/cmds/RandomTests.scala b/.../test/scala/tyrian/cmds/RandomTests.scala → .../test/scala/tyrian/cmds/RandomTests.scala