Update for latest live_view_native (#1490)

* updates to LiveViewNativeTest
* use expanded curly braces
* add LiveViewNative.SwiftUI.Client

.github/workflows/elixir.yml

@@ -20,8 +20,8 @@ jobs:
     - name: Set up Elixir
       uses: erlef/setup-beam@v1
       with:
-        elixir-version: '1.15.0' # Define the elixir version [required]
-        otp-version: '25.0' # Define the OTP version [required]
+        elixir-version: '1.17.0' # Define the elixir version [required]
+        otp-version: '27.1.2' # Define the OTP version [required]
     - name: Restore dependencies cache
       uses: actions/cache@v3
       with:

CHANGELOG.md

@@ -9,6 +9,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
+* LiveViewNative.SwiftUI.Client
+
 ### Changed
 
 ### Fixed

config/test.exs

@@ -17,7 +17,7 @@ config :mime, :types, %{
   "text/swiftui" => ["swiftui"]
 }
 
-config :live_view_native_test,
+config :live_view_native_test_endpoint,
   formats: [:swiftui],
   otp_app: :live_view_native_swiftui,
   routes: [

lib/live_view_native/swiftui.ex

@@ -6,7 +6,8 @@ defmodule LiveViewNative.SwiftUI do
     component: LiveViewNative.SwiftUI.Component,
     module_suffix: :SwiftUI,
     template_engine: LiveViewNative.Engine,
-    stylesheet_rules_parser: LiveViewNative.SwiftUI.RulesParser
+    stylesheet_rules_parser: LiveViewNative.SwiftUI.RulesParser,
+    client: LiveViewNative.SwiftUI.Client
 
   def normalize_os_version(os_version),
     do: normalize_version(os_version)

lib/live_view_native/swiftui/client.ex

@@ -0,0 +1,8 @@
+defmodule LiveViewNativeTest.SwftUI.Client do
+  @moduledoc false
+
+  defstruct tags: %{
+    form: "LiveForm",
+    button: "Button"
+  }
+end

mix.exs

@@ -58,7 +58,7 @@ defmodule LiveViewNative.SwiftUI.MixProject do
       {:live_view_native_stylesheet, "~> 0.3.1", only: :test},
       {:live_view_native_live_form, github: "liveview-native/liveview-native-live-form", only: :test},
       {:gettext, "~> 0.20", only: :test},
-      {:live_view_native_test, github: "liveview-native/live_view_native_test_endpoint", ref: "539ae931fa3936f3ee2f73ffa11f7100fe6554db", only: :test},
+      {:live_view_native_test_endpoint, github: "liveview-native/live_view_native_test_endpoint", branch: "main", only: :test},
       {:nimble_parsec, "~> 1.3"}
     ]
   end

mix.lock

@@ -4,15 +4,15 @@
   "cowboy_telemetry": {:hex, :cowboy_telemetry, "0.4.0", "f239f68b588efa7707abce16a84d0d2acf3a0f50571f8bb7f56a15865aae820c", [:rebar3], [{:cowboy, "~> 2.7", [hex: :cowboy, repo: "hexpm", optional: false]}, {:telemetry, "~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "7d98bac1ee4565d31b62d59f8823dfd8356a169e7fcbb83831b8a5397404c9de"},
   "cowlib": {:hex, :cowlib, "2.13.0", "db8f7505d8332d98ef50a3ef34b34c1afddec7506e4ee4dd4a3a266285d282ca", [:make, :rebar3], [], "hexpm", "e1e1284dc3fc030a64b1ad0d8382ae7e99da46c3246b815318a4b848873800a4"},
   "earmark_parser": {:hex, :earmark_parser, "1.4.41", "ab34711c9dc6212dda44fcd20ecb87ac3f3fce6f0ca2f28d4a00e4154f8cd599", [:mix], [], "hexpm", "a81a04c7e34b6617c2792e291b5a2e57ab316365c2644ddc553bb9ed863ebefa"},
-  "ex_doc": {:hex, :ex_doc, "0.34.2", "13eedf3844ccdce25cfd837b99bea9ad92c4e511233199440488d217c92571e8", [:mix], [{:earmark_parser, "~> 1.4.39", [hex: :earmark_parser, repo: "hexpm", optional: false]}, {:makeup_c, ">= 0.1.0", [hex: :makeup_c, repo: "hexpm", optional: true]}, {:makeup_elixir, "~> 0.14 or ~> 1.0", [hex: :makeup_elixir, repo: "hexpm", optional: false]}, {:makeup_erlang, "~> 0.1 or ~> 1.0", [hex: :makeup_erlang, repo: "hexpm", optional: false]}, {:makeup_html, ">= 0.1.0", [hex: :makeup_html, repo: "hexpm", optional: true]}], "hexpm", "5ce5f16b41208a50106afed3de6a2ed34f4acfd65715b82a0b84b49d995f95c1"},
+  "ex_doc": {:hex, :ex_doc, "0.35.1", "de804c590d3df2d9d5b8aec77d758b00c814b356119b3d4455e4b8a8687aecaf", [:mix], [{:earmark_parser, "~> 1.4.39", [hex: :earmark_parser, repo: "hexpm", optional: false]}, {:makeup_c, ">= 0.1.0", [hex: :makeup_c, repo: "hexpm", optional: true]}, {:makeup_elixir, "~> 0.14 or ~> 1.0", [hex: :makeup_elixir, repo: "hexpm", optional: false]}, {:makeup_erlang, "~> 0.1 or ~> 1.0", [hex: :makeup_erlang, repo: "hexpm", optional: false]}, {:makeup_html, ">= 0.1.0", [hex: :makeup_html, repo: "hexpm", optional: true]}], "hexpm", "2121c6402c8d44b05622677b761371a759143b958c6c19f6558ff64d0aed40df"},
   "expo": {:hex, :expo, "1.1.0", "f7b9ed7fb5745ebe1eeedf3d6f29226c5dd52897ac67c0f8af62a07e661e5c75", [:mix], [], "hexpm", "fbadf93f4700fb44c331362177bdca9eeb8097e8b0ef525c9cc501cb9917c960"},
   "floki": {:hex, :floki, "0.36.3", "1102f93b16a55bc5383b85ae3ec470f82dee056eaeff9195e8afdf0ef2a43c30", [:mix], [], "hexpm", "fe0158bff509e407735f6d40b3ee0d7deb47f3f3ee7c6c182ad28599f9f6b27a"},
   "gettext": {:hex, :gettext, "0.26.2", "5978aa7b21fada6deabf1f6341ddba50bc69c999e812211903b169799208f2a8", [:mix], [{:expo, "~> 0.5.1 or ~> 1.0", [hex: :expo, repo: "hexpm", optional: false]}], "hexpm", "aa978504bcf76511efdc22d580ba08e2279caab1066b76bb9aa81c4a1e0a32a5"},
   "jason": {:hex, :jason, "1.4.4", "b9226785a9aa77b6857ca22832cffa5d5011a667207eb2a0ad56adb5db443b8a", [:mix], [{:decimal, "~> 1.0 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: true]}], "hexpm", "c5eb0cab91f094599f94d55bc63409236a8ec69a21a67814529e8d5f6cc90b3b"},
-  "live_view_native": {:git, "https://github.com/liveview-native/live_view_native.git", "c3ec1775e636d47b94130e080ce61cca31c0f0f8", []},
-  "live_view_native_live_form": {:git, "https://github.com/liveview-native/liveview-native-live-form.git", "55c66279e07081ca07d76b9965368209833bab7d", []},
+  "live_view_native": {:git, "https://github.com/liveview-native/live_view_native.git", "d782846919e5065909339f240874d14f3c016ae2", []},
+  "live_view_native_live_form": {:git, "https://github.com/liveview-native/liveview-native-live-form.git", "de83d04d5f586fd20849490daae30a85ad321d77", []},
   "live_view_native_stylesheet": {:hex, :live_view_native_stylesheet, "0.3.1", "71a1cee29ec3fe0003949250035ec905e6e7c706928e94ff8823be8108267e1b", [:mix], [{:live_view_native, "~> 0.3.1", [hex: :live_view_native, repo: "hexpm", optional: false]}, {:nimble_parsec, "~> 1.3", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "ca2a9a47b34be56099d6c1523a2cb69274ba2a5ecff441cacb4b885483fb39b3"},
-  "live_view_native_test": {:git, "https://github.com/liveview-native/live_view_native_test_endpoint.git", "539ae931fa3936f3ee2f73ffa11f7100fe6554db", [ref: "539ae931fa3936f3ee2f73ffa11f7100fe6554db"]},
+  "live_view_native_test_endpoint": {:git, "https://github.com/liveview-native/live_view_native_test_endpoint.git", "29153c238498426354529ae0816e00a172247bb3", [branch: "main"]},
   "makeup": {:hex, :makeup, "1.2.1", "e90ac1c65589ef354378def3ba19d401e739ee7ee06fb47f94c687016e3713d1", [:mix], [{:nimble_parsec, "~> 1.4", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "d36484867b0bae0fea568d10131197a4c2e47056a6fbe84922bf6ba71c8d17ce"},
   "makeup_eex": {:hex, :makeup_eex, "1.0.0", "436d4c00204c250b17a775d64e197798aaf374627e6a4f2d3fd3074a8db61db4", [:mix], [{:makeup, "~> 1.2.1 or ~> 1.3", [hex: :makeup, repo: "hexpm", optional: false]}, {:makeup_elixir, "~> 1.0", [hex: :makeup_elixir, repo: "hexpm", optional: false]}, {:makeup_html, "~> 0.1.0 or ~> 1.0", [hex: :makeup_html, repo: "hexpm", optional: false]}, {:nimble_parsec, "~> 1.2", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "3bb699bc519e4f509f1bf8a2e0ba0e08429edf3580053cd31a4f9c1bc5da86c8"},
   "makeup_elixir": {:hex, :makeup_elixir, "1.0.0", "74bb8348c9b3a51d5c589bf5aebb0466a84b33274150e3b6ece1da45584afc82", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}, {:nimble_parsec, "~> 1.2.3 or ~> 1.3", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "49159b7d7d999e836bedaf09dcf35ca18b312230cf901b725a64f3f42e407983"},
@@ -22,9 +22,9 @@
   "makeup_swift": {:hex, :makeup_swift, "0.0.2", "d62c7ae04622985806435536f3680b40559a4c426e4c2fc009b7ea610e55358a", [:mix], [{:makeup, "~> 1.1", [hex: :makeup, repo: "hexpm", optional: false]}, {:nimble_parsec, "~> 1.3", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "8f8e0f47b5a5824bf33ad2a5bf39ef665188af19b3b165f9fe81aa40f09ca7fc"},
   "mime": {:hex, :mime, "2.0.6", "8f18486773d9b15f95f4f4f1e39b710045fa1de891fada4516559967276e4dc2", [:mix], [], "hexpm", "c9945363a6b26d747389aac3643f8e0e09d30499a138ad64fe8fd1d13d9b153e"},
   "nimble_parsec": {:hex, :nimble_parsec, "1.4.0", "51f9b613ea62cfa97b25ccc2c1b4216e81df970acd8e16e8d1bdc58fef21370d", [:mix], [], "hexpm", "9c565862810fb383e9838c1dd2d7d2c437b3d13b267414ba6af33e50d2d1cf28"},
-  "phoenix": {:hex, :phoenix, "1.7.14", "a7d0b3f1bc95987044ddada111e77bd7f75646a08518942c72a8440278ae7825", [:mix], [{:castore, ">= 0.0.0", [hex: :castore, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:phoenix_pubsub, "~> 2.1", [hex: :phoenix_pubsub, repo: "hexpm", optional: false]}, {:phoenix_template, "~> 1.0", [hex: :phoenix_template, repo: "hexpm", optional: false]}, {:phoenix_view, "~> 2.0", [hex: :phoenix_view, repo: "hexpm", optional: true]}, {:plug, "~> 1.14", [hex: :plug, repo: "hexpm", optional: false]}, {:plug_cowboy, "~> 2.7", [hex: :plug_cowboy, repo: "hexpm", optional: true]}, {:plug_crypto, "~> 1.2 or ~> 2.0", [hex: :plug_crypto, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}, {:websock_adapter, "~> 0.5.3", [hex: :websock_adapter, repo: "hexpm", optional: false]}], "hexpm", "c7859bc56cc5dfef19ecfc240775dae358cbaa530231118a9e014df392ace61a"},
+  "phoenix": {:hex, :phoenix, "1.7.16", "b9f7100b06dfe85e1f35e734e4691d736d4738e3cbf83dd11ba1ef7fa021c49e", [:mix], [{:castore, ">= 0.0.0", [hex: :castore, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:phoenix_pubsub, "~> 2.1", [hex: :phoenix_pubsub, repo: "hexpm", optional: false]}, {:phoenix_template, "~> 1.0", [hex: :phoenix_template, repo: "hexpm", optional: false]}, {:phoenix_view, "~> 2.0", [hex: :phoenix_view, repo: "hexpm", optional: true]}, {:plug, "~> 1.14", [hex: :plug, repo: "hexpm", optional: false]}, {:plug_cowboy, "~> 2.7", [hex: :plug_cowboy, repo: "hexpm", optional: true]}, {:plug_crypto, "~> 1.2 or ~> 2.0", [hex: :plug_crypto, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}, {:websock_adapter, "~> 0.5.3", [hex: :websock_adapter, repo: "hexpm", optional: false]}], "hexpm", "17d3a2909000a8f47c14145f344be2258da425e802fb70cb7dc3e5df24590bb0"},
   "phoenix_html": {:hex, :phoenix_html, "4.1.1", "4c064fd3873d12ebb1388425a8f2a19348cef56e7289e1998e2d2fa758aa982e", [:mix], [], "hexpm", "f2f2df5a72bc9a2f510b21497fd7d2b86d932ec0598f0210fed4114adc546c6f"},
-  "phoenix_live_view": {:hex, :phoenix_live_view, "0.20.17", "f396bbdaf4ba227b82251eb75ac0afa6b3da5e509bc0d030206374237dfc9450", [:mix], [{:floki, "~> 0.36", [hex: :floki, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:phoenix, "~> 1.6.15 or ~> 1.7.0", [hex: :phoenix, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 3.3 or ~> 4.0", [hex: :phoenix_html, repo: "hexpm", optional: false]}, {:phoenix_template, "~> 1.0", [hex: :phoenix_template, repo: "hexpm", optional: false]}, {:phoenix_view, "~> 2.0", [hex: :phoenix_view, repo: "hexpm", optional: true]}, {:plug, "~> 1.15", [hex: :plug, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4.2 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "a61d741ffb78c85fdbca0de084da6a48f8ceb5261a79165b5a0b59e5f65ce98b"},
+  "phoenix_live_view": {:hex, :phoenix_live_view, "1.0.0-rc.9", "6d08ce08a091710f15f36cf8249a16ddf59cc7156ad0c57989a2858b8bc94f0b", [:mix], [{:floki, "~> 0.36", [hex: :floki, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:phoenix, "~> 1.6.15 or ~> 1.7.0", [hex: :phoenix, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 3.3 or ~> 4.0", [hex: :phoenix_html, repo: "hexpm", optional: false]}, {:phoenix_template, "~> 1.0", [hex: :phoenix_template, repo: "hexpm", optional: false]}, {:phoenix_view, "~> 2.0", [hex: :phoenix_view, repo: "hexpm", optional: true]}, {:plug, "~> 1.15", [hex: :plug, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4.2 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "8479ba909b6aeedcef312c030363906a689f96ac42376269a39f10c718746bfe"},
   "phoenix_pubsub": {:hex, :phoenix_pubsub, "2.1.3", "3168d78ba41835aecad272d5e8cd51aa87a7ac9eb836eabc42f6e57538e3731d", [:mix], [], "hexpm", "bba06bc1dcfd8cb086759f0edc94a8ba2bc8896d5331a1e2c2902bf8e36ee502"},
   "phoenix_template": {:hex, :phoenix_template, "1.0.4", "e2092c132f3b5e5b2d49c96695342eb36d0ed514c5b252a77048d5969330d639", [:mix], [{:phoenix_html, "~> 2.14.2 or ~> 3.0 or ~> 4.0", [hex: :phoenix_html, repo: "hexpm", optional: true]}], "hexpm", "2c0c81f0e5c6753faf5cca2f229c9709919aba34fab866d3bc05060c9c444206"},
   "phoenix_view": {:hex, :phoenix_view, "2.0.4", "b45c9d9cf15b3a1af5fb555c674b525391b6a1fe975f040fb4d913397b31abf4", [:mix], [{:phoenix_html, "~> 2.14.2 or ~> 3.0 or ~> 4.0", [hex: :phoenix_html, repo: "hexpm", optional: true]}, {:phoenix_template, "~> 1.0", [hex: :phoenix_template, repo: "hexpm", optional: false]}], "hexpm", "4e992022ce14f31fe57335db27a28154afcc94e9983266835bb3040243eb620b"},

test/live_view_native/swiftui/core_components_test.exs

@@ -376,7 +376,7 @@ defmodule LiveViewNative.SwiftUI.CoreComponentsTest do
       template = ~LVN"""
       <.list>
         <:item :for={item <- [%{title: "Foo"}, %{title: "Bar"}]} title={item.title}>
-          <Text><%= item.title %></Text>
+          <Text>{item.title}</Text>
         </:item>
       </.list>
       """

test/live_view_native/swiftui/integrations/inline_test.exs

@@ -2,7 +2,7 @@ defmodule LiveViewNative.SwiftUI.InlineRenderTest do
   use ExUnit.Case, async: false
 
   import Phoenix.ConnTest
-  import Phoenix.LiveViewTest
+  require Phoenix.LiveViewTest
   import LiveViewNativeTest
 
   @endpoint LiveViewNativeTest.Endpoint
@@ -12,14 +12,14 @@ defmodule LiveViewNative.SwiftUI.InlineRenderTest do
   end
 
   test "can render the override html format", %{conn: conn} do
-    {:ok, lv, _body} = native(conn, "/inline", :swiftui)
+    {:ok, lv, _body} = live(conn, "/inline", _format: :swiftui)
 
-    assert lv |> element("text") |> render() =~ "Inline SwiftUI Render 100"
+    assert lv |> element("Text") |> render() =~ "Inline SwiftUI Render 100"
   end
 
   test "can render the swiftui format with watchos target", %{conn: conn} do
-    {:ok, lv, _body} = native(conn, "/inline", :swiftui, %{"target" => "watchos"})
+    {:ok, lv, _body} = live(conn, "/inline", _format: :swiftui, _interface: %{"target" => "watchos"})
 
-    assert lv |> element("text") |> render() =~ "WatchOS Target Inline SwiftUI Render 100"
+    assert lv |> element("Text") |> render() =~ "WatchOS Target Inline SwiftUI Render 100"
   end
 end

test/live_view_native/swiftui/integrations/template_test.exs

@@ -2,7 +2,7 @@ defmodule LiveViewNative.SwiftUI.TemplateRenderTest do
   use ExUnit.Case, async: false
 
   import Phoenix.ConnTest
-  import Phoenix.LiveViewTest
+  require Phoenix.LiveViewTest
   import LiveViewNativeTest
 
   @endpoint LiveViewNativeTest.Endpoint
@@ -12,14 +12,14 @@ defmodule LiveViewNative.SwiftUI.TemplateRenderTest do
   end
 
   test "can render the override swiftui format", %{conn: conn} do
-    {:ok, lv, _body} = native(conn, "/template", :swiftui)
+    {:ok, lv, _body} = live(conn, "/template", _format: :swiftui)
 
-    assert lv |> element("text") |> render() =~ "Template SwiftUI Render 100"
+    assert lv |> element("Text") |> render() =~ "Template SwiftUI Render 100"
   end
 
   test "can render the override swiftui format with watchos target", %{conn: conn} do
-    {:ok, lv, _body} = native(conn, "/template", :swiftui, %{"target" => "watchos"})
+    {:ok, lv, _body} = live(conn, "/template", _format: :swiftui, _interface: %{"target" => "watchos"})
 
-    assert lv |> element("text") |> render() =~ "WatchOS Target Template SwiftUI Render 100"
+    assert lv |> element("Text") |> render() =~ "WatchOS Target Template SwiftUI Render 100"
   end
 end

test/support/components/layouts_swiftui/app.swiftui+watchos.neex

@@ -1 +1 @@
-<WatchOSContainer><%= @inner_content %></WatchOSContainer>
+<WatchOSContainer>{@inner_content}</WatchOSContainer>

test/support/components/layouts_swiftui/app.swiftui.neex

@@ -1 +1 @@
-<AppContainer><%= @inner_content %></AppContainer>
+<AppContainer>{@inner_content}</AppContainer>

test/support/components/layouts_swiftui/root.swiftui.neex

@@ -1,2 +1,2 @@
 <meta name="csrf-token" content={get_csrf_token()} />
-<%= @inner_content %>
+{@inner_content}

test/support/live/inline_live.ex

@@ -5,13 +5,13 @@ defmodule LiveViewNativeTest.SwiftUI.InlineLive.SwiftUI do
 
   def render(assigns, %{"target" => "watchos"}) do
     ~LVN"""
-    <Text>WatchOS Target Inline SwiftUI Render <%= @count %></Text>
+    <Text>WatchOS Target Inline SwiftUI Render {@count}</Text>
     """
   end
 
   def render(assigns, _interface) do
     ~LVN"""
-    <Text>Inline SwiftUI Render <%= @count %></Text>
+    <Text>Inline SwiftUI Render {@count}</Text>
     """
   end
 end
@@ -31,4 +31,4 @@ defmodule LiveViewNativeTest.SwiftUI.InlineLive do
   end
 
   def render(assigns), do: ~H""
-end
+end

test/support/live/swiftui/template_live.swiftui+watchos.neex

@@ -1 +1 @@
-<Text>WatchOS Target Template SwiftUI Render <%= @count %></Text>
+<Text>WatchOS Target Template SwiftUI Render {@count}</Text>

test/support/live/swiftui/template_live.swiftui.neex

@@ -1 +1 @@
-<Text>Template SwiftUI Render <%= @count %></Text>
+<Text>Template SwiftUI Render {@count}</Text>