Prepare 0.3.3 release

Author: dannote

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## v0.3.3
+
+- Fix HEEx icon discovery with Phoenix LiveView 1.2 tag engine parser
+- Keep scanner compatibility with LiveView 1.1 and older tokenizer APIs
+
 ## v0.3.2
 
 - Improve compile-time icon discovery for wrapper component `icon` attributes and same-line recoverable HEEx inside EEx blocks

lib/phoenix_iconify/scanner.ex

@@ -3,7 +3,15 @@ defmodule PhoenixIconify.Scanner do
   Scans source files for literal icon component usage.
   """
 
-  alias Phoenix.LiveView.Tokenizer
+  @compile {:no_warn_undefined, {Phoenix.LiveView.Tokenizer, :init, 4}}
+  @compile {:no_warn_undefined, {Phoenix.LiveView.Tokenizer, :tokenize, 5}}
+  @compile {:no_warn_undefined, {Phoenix.LiveView.TagEngine.Parser, :tokenize, 2}}
+  @compile {:no_warn_undefined, {Phoenix.LiveView.TagEngine.Tokenizer, :init, 4}}
+  @compile {:no_warn_undefined, {Phoenix.LiveView.TagEngine.Tokenizer, :tokenize, 5}}
+
+  alias Phoenix.LiveView.HTMLEngine
+  alias Phoenix.LiveView.TagEngine
+  alias Phoenix.LiveView.Tokenizer, as: LegacyTokenizer
 
   @doc """
   Scans all relevant source files and extracts icon names.
@@ -79,7 +87,12 @@ defmodule PhoenixIconify.Scanner do
   defp tokenize_heex(content, path) do
     do_tokenize_heex(content, path)
   rescue
-    Phoenix.LiveView.Tokenizer.ParseError -> tokenize_heex_lines(content, path)
+    error ->
+      if parse_error?(error) do
+        tokenize_heex_lines(content, path)
+      else
+        reraise(error, __STACKTRACE__)
+      end
   end
 
   defp tokenize_heex_lines(content, path) do
@@ -90,18 +103,83 @@ defmodule PhoenixIconify.Scanner do
       try do
         do_tokenize_heex(line, path, line_number)
       rescue
-        Phoenix.LiveView.Tokenizer.ParseError -> []
+        error ->
+          if parse_error?(error) do
+            []
+          else
+            reraise(error, __STACKTRACE__)
+          end
       end
     end)
   end
 
   defp do_tokenize_heex(content, path, line \\ 1) do
-    state = Tokenizer.init(0, path, content, Phoenix.LiveView.HTMLEngine)
+    case heex_tokenizer() do
+      :parser ->
+        TagEngine.Parser.tokenize(content,
+          file: path,
+          line: line,
+          column: 1,
+          tag_handler: HTMLEngine,
+          trim_eex: false,
+          strip_eex_comments: true
+        )
+
+      :tag_engine_tokenizer ->
+        state = TagEngine.Tokenizer.init(0, path, content, HTMLEngine)
+
+        {tokens, _cont} =
+          TagEngine.Tokenizer.tokenize(
+            content,
+            [line: line, column: 1],
+            [],
+            {:text, :enabled},
+            state
+          )
+
+        tokens
+
+      :legacy_tokenizer ->
+        state = LegacyTokenizer.init(0, path, content, HTMLEngine)
+
+        {tokens, _cont} =
+          LegacyTokenizer.tokenize(
+            content,
+            [line: line, column: 1],
+            [],
+            {:text, :enabled},
+            state
+          )
+
+        tokens
+    end
+  end
 
-    {tokens, _cont} =
-      Tokenizer.tokenize(content, [line: line, column: 1], [], {:text, :enabled}, state)
+  defp heex_tokenizer do
+    cond do
+      Code.ensure_loaded?(TagEngine.Parser) -> :parser
+      Code.ensure_loaded?(TagEngine.Tokenizer) -> :tag_engine_tokenizer
+      Code.ensure_loaded?(LegacyTokenizer) -> :legacy_tokenizer
+    end
+  end
 
-    tokens
+  defp parse_error?(error) do
+    error
+    |> Map.get(:__struct__)
+    |> case do
+      module when is_atom(module) ->
+        module
+        |> Atom.to_string()
+        |> then(
+          &(&1 in [
+              "Elixir.Phoenix.LiveView.Tokenizer.ParseError",
+              "Elixir.Phoenix.LiveView.TagEngine.Tokenizer.ParseError"
+            ])
+        )
+
+      _ ->
+        false
+    end
   end
 
   defp icons_from_tokens(tokens) do

mix.exs

@@ -1,7 +1,7 @@
 defmodule PhoenixIconify.MixProject do
   use Mix.Project
 
-  @version "0.3.2"
+  @version "0.3.3"
   @source_url "https://github.com/elixir-volt/phoenix_iconify"
 
   def project do

mix.lock

@@ -19,9 +19,9 @@
   "nimble_options": {:hex, :nimble_options, "1.1.1", "e3a492d54d85fc3fd7c5baf411d9d2852922f66e69476317787a7b2bb000a61b", [:mix], [], "hexpm", "821b2470ca9442c4b6984882fe9bb0389371b8ddec4d45a9504f00a66f650b44"},
   "nimble_parsec": {:hex, :nimble_parsec, "1.4.2", "8efba0122db06df95bfaa78f791344a89352ba04baedd3849593bfce4d0dc1c6", [:mix], [], "hexpm", "4b21398942dda052b403bbe1da991ccd03a053668d147d53fb8c4e0efe09c973"},
   "nimble_pool": {:hex, :nimble_pool, "1.1.0", "bf9c29fbdcba3564a8b800d1eeb5a3c58f36e1e11d7b7fb2e084a643f645f06b", [:mix], [], "hexpm", "af2e4e6b34197db81f7aad230c1118eac993acc0dae6bc83bac0126d4ae0813a"},
-  "phoenix": {:hex, :phoenix, "1.8.4", "0387f84f00071cba8d71d930b9121b2fb3645197a9206c31b908d2e7902a4851", [:mix], [{:bandit, "~> 1.0", [hex: :bandit, repo: "hexpm", optional: true]}, {: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", "c988b1cd3b084eebb13e6676d572597d387fa607dab258526637b4e6c4c08543"},
+  "phoenix": {:hex, :phoenix, "1.8.8", "ada3d761359274178180c0e992ef0c2b536bd7c3bd75ebba94acbf39ab4347fe", [:mix], [{:bandit, "~> 1.0", [hex: :bandit, repo: "hexpm", optional: true]}, {: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", "f0c843037bd2e7012fc1d1ec9574dfa6972b7e3d09e9b77fd23aa283af0aa994"},
   "phoenix_html": {:hex, :phoenix_html, "4.3.0", "d3577a5df4b6954cd7890c84d955c470b5310bb49647f0a114a6eeecc850f7ad", [:mix], [], "hexpm", "3eaa290a78bab0f075f791a46a981bbe769d94bc776869f4f3063a14f30497ad"},
-  "phoenix_live_view": {:hex, :phoenix_live_view, "1.1.24", "1a000a048d5971b61a9efe29a3c4144ca955afd42224998d841c5011a5354838", [:mix], [{:igniter, ">= 0.6.16 and < 1.0.0-0", [hex: :igniter, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:lazy_html, "~> 0.1.0", [hex: :lazy_html, repo: "hexpm", optional: true]}, {:phoenix, "~> 1.6.15 or ~> 1.7.0 or ~> 1.8.0-rc", [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", "0c724e6c65f197841cac49d73be4e0f9b93a7711eaa52d2d4d1b9f859c329267"},
+  "phoenix_live_view": {:hex, :phoenix_live_view, "1.2.3", "e8abe7f2acb96d98695e9290b35cb5a01a696cc2086d4ff2e0b3aa8b9c74675f", [:mix], [{:igniter, ">= 0.6.16 and < 1.0.0-0", [hex: :igniter, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:lazy_html, "~> 0.1.0", [hex: :lazy_html, repo: "hexpm", optional: true]}, {:phoenix, "~> 1.6.15 or ~> 1.7.0 or ~> 1.8.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", "449affd6aea24daaa2f6b43748fc1e2c6a87610df996cc1f54e7b19a7a18e638"},
   "phoenix_pubsub": {:hex, :phoenix_pubsub, "2.2.0", "ff3a5616e1bed6804de7773b92cbccfc0b0f473faf1f63d7daf1206c7aeaaa6f", [:mix], [], "hexpm", "adc313a5bf7136039f63cfd9668fde73bba0765e0614cba80c06ac9460ff3e96"},
   "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"},
   "plug": {:hex, :plug, "1.19.2", "e4950525b22c6789dfb38a3f95d47171ba159da3fc5a33be9643b43d5e8adb98", [:mix], [{:mime, "~> 1.0 or ~> 2.0", [hex: :mime, repo: "hexpm", optional: false]}, {:plug_crypto, "~> 1.1.1 or ~> 1.2 or ~> 2.0", [hex: :plug_crypto, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4.3 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "b6fce20a56af5e60fa5dfecf3f907bb98ec981be43c79a3809a499bc3d133de0"},