Release v0.10.17

Author: dannote

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+## 0.10.17
+
+- Update `oxc` to 0.17.0 and use the selector API for import discovery.
+
 ## 0.10.16
 
 - Update `oxc` to 0.16.0

lib/quickbeam/js.ex

@@ -33,7 +33,7 @@ defmodule QuickBEAM.JS do
 
     def bundle(ts_dir, barrel) do
       barrel_source = File.read!(Path.join(ts_dir, barrel))
-      {:ok, specifiers} = OXC.imports(barrel_source, barrel)
+      {:ok, specifiers} = OXC.select(barrel_source, barrel, :import_specifiers)
 
       import_names =
         specifiers
@@ -311,11 +311,16 @@ defmodule QuickBEAM.JS do
       # => {:ok, ["vue"]}
   """
   @spec imports(String.t(), String.t()) :: {:ok, [String.t()]} | {:error, [String.t()]}
-  defdelegate imports(source, filename), to: OXC
+  def imports(source, filename), do: OXC.select(source, filename, :import_specifiers)
 
   @doc "Like `imports/2` but raises on errors."
   @spec imports!(String.t(), String.t()) :: [String.t()]
-  defdelegate imports!(source, filename), to: OXC
+  def imports!(source, filename) do
+    case imports(source, filename) do
+      {:ok, imports} -> imports
+      {:error, errors} -> raise OXC.Error, errors: errors
+    end
+  end
 
   @doc """
   Bundle multiple TS/JS modules into a single self-executing script.

lib/quickbeam/js/bundler.ex

@@ -25,20 +25,22 @@ defmodule QuickBEAM.JS.Bundler do
   end
 
   defp collect_modules(entry_path, project_root) do
-    case do_collect(entry_path, project_root, [], MapSet.new()) do
+    case do_collect(entry_path, project_root, [], %{}) do
       {:ok, files, _seen} -> {:ok, Enum.reverse(files)}
       {:error, _} = error -> error
     end
   end
 
+  @spec do_collect(String.t(), String.t(), [{String.t(), String.t()}], %{String.t() => true}) ::
+          {:ok, [{String.t(), String.t()}], %{String.t() => true}} | {:error, term()}
   defp do_collect(abs_path, project_root, files, seen) do
-    if MapSet.member?(seen, abs_path) do
+    if Map.has_key?(seen, abs_path) do
       {:ok, files, seen}
     else
       with {:ok, source} <- File.read(abs_path),
            {:ok, rewritten, resolved_paths} <- rewrite_and_resolve(source, abs_path, project_root) do
         label = relative_label(abs_path, project_root)
-        seen = MapSet.put(seen, abs_path)
+        seen = Map.put(seen, abs_path, true)
         files = [{label, rewritten} | files]
         collect_deps(resolved_paths, project_root, files, seen)
       else
@@ -48,6 +50,8 @@ defmodule QuickBEAM.JS.Bundler do
     end
   end
 
+  @spec collect_deps([String.t()], String.t(), [{String.t(), String.t()}], %{String.t() => true}) ::
+          {:ok, [{String.t(), String.t()}], %{String.t() => true}} | {:error, term()}
   defp collect_deps([], _project_root, files, seen), do: {:ok, files, seen}
 
   defp collect_deps([path | rest], project_root, files, seen) do

lib/quickbeam/script.ex

@@ -25,7 +25,7 @@ defmodule QuickBEAM.Script do
   defp typescript?(path), do: String.ends_with?(path, ".ts") or String.ends_with?(path, ".tsx")
 
   defp has_imports?(source, path) do
-    case OXC.imports(source, Path.basename(path)) do
+    case OXC.select(source, Path.basename(path), :import_specifiers) do
       {:ok, [_ | _]} -> true
       _ -> false
     end

lib/quickbeam/subtle_crypto.ex

@@ -147,7 +147,7 @@ defmodule QuickBEAM.SubtleCrypto do
         aad = to_binary(Map.get(algo, "additionalData", []))
         tag_length = div(Map.get(algo, "tagLength", 128), 8)
         ct_len = byte_size(bytes) - tag_length
-        <<ct::binary-size(ct_len), tag::binary-size(tag_length)>> = bytes
+        <<ct::binary-size(^ct_len), tag::binary-size(^tag_length)>> = bytes
 
         case :crypto.crypto_one_time_aead(aes_gcm_algo(key), key, iv, ct, aad, tag, false) do
           :error -> raise "Decryption failed"

lib/quickbeam/wasm/import_rewriter.ex

@@ -248,7 +248,7 @@ defmodule QuickBEAM.WASM.ImportRewriter do
   defp parse_sections(<<id, rest::binary>>, acc) do
     with {size, rest} <- decode_u32(rest),
          true <- byte_size(rest) >= size,
-         <<payload::binary-size(size), tail::binary>> <- rest do
+         <<payload::binary-size(^size), tail::binary>> <- rest do
       parse_sections(tail, [{id, payload} | acc])
     else
       _ -> {:error, "truncated WASM section"}
@@ -314,23 +314,23 @@ defmodule QuickBEAM.WASM.ImportRewriter do
   defp take_limits_raw(<<0x00, rest::binary>> = data) do
     {_min, rest} = decode_u32(rest)
     consumed = byte_size(data) - byte_size(rest)
-    <<raw::binary-size(consumed), tail::binary>> = data
+    <<raw::binary-size(^consumed), tail::binary>> = data
     {raw, tail}
   end
 
   defp take_limits_raw(<<0x01, rest::binary>> = data) do
     {_min, rest} = decode_u32(rest)
     {_max, rest} = decode_u32(rest)
     consumed = byte_size(data) - byte_size(rest)
-    <<raw::binary-size(consumed), tail::binary>> = data
+    <<raw::binary-size(^consumed), tail::binary>> = data
     {raw, tail}
   end
 
   defp take_global_raw(<<_type, _mutable, rest::binary>> = data) do
     case :binary.match(rest, <<0x0B>>) do
       {expr_size, 1} ->
         raw_size = 2 + expr_size + 1
-        <<raw::binary-size(raw_size), tail::binary>> = data
+        <<raw::binary-size(^raw_size), tail::binary>> = data
         {raw, tail}
 
       :nomatch ->

lib/quickbeam/wasm/parser.ex

@@ -48,7 +48,7 @@ defmodule QuickBEAM.WASM.Parser do
 
   defp parse_sections(<<id, rest::binary>>, mod) do
     {size, rest} = decode_u32(rest)
-    <<section_data::binary-size(size), rest::binary>> = rest
+    <<section_data::binary-size(^size), rest::binary>> = rest
 
     mod = parse_section(id, section_data, mod)
     parse_sections(rest, mod)
@@ -181,7 +181,7 @@ defmodule QuickBEAM.WASM.Parser do
 
   defp parse_name_subsections(<<id, rest::binary>>, names) do
     {size, rest} = decode_u32(rest)
-    <<subsection::binary-size(size), rest::binary>> = rest
+    <<subsection::binary-size(^size), rest::binary>> = rest
 
     names =
       case id do
@@ -382,29 +382,29 @@ defmodule QuickBEAM.WASM.Parser do
   defp decode_data_segment(<<0x00, rest::binary>>) do
     {offset, rest} = decode_expr(rest)
     {size, rest} = decode_u32(rest)
-    <<bytes::binary-size(size), rest::binary>> = rest
+    <<bytes::binary-size(^size), rest::binary>> = rest
     {%{memory_idx: 0, offset: offset, bytes: bytes}, rest}
   end
 
   defp decode_data_segment(<<0x01, rest::binary>>) do
     {size, rest} = decode_u32(rest)
-    <<bytes::binary-size(size), rest::binary>> = rest
+    <<bytes::binary-size(^size), rest::binary>> = rest
     {%{memory_idx: nil, offset: nil, bytes: bytes}, rest}
   end
 
   defp decode_data_segment(<<0x02, rest::binary>>) do
     {mem_idx, rest} = decode_u32(rest)
     {offset, rest} = decode_expr(rest)
     {size, rest} = decode_u32(rest)
-    <<bytes::binary-size(size), rest::binary>> = rest
+    <<bytes::binary-size(^size), rest::binary>> = rest
     {%{memory_idx: mem_idx, offset: offset, bytes: bytes}, rest}
   end
 
   # ── Code body decoder ──────────────────────────────────
 
   defp decode_code_body(data) do
     {body_size, data} = decode_u32(data)
-    <<body::binary-size(body_size), rest::binary>> = data
+    <<body::binary-size(^body_size), rest::binary>> = data
     {locals, body} = decode_locals(body)
     opcodes = decode_instructions(body)
     {{locals, opcodes}, rest}
@@ -928,7 +928,7 @@ defmodule QuickBEAM.WASM.Parser do
 
   defp decode_name(data) do
     {len, data} = decode_u32(data)
-    <<name::binary-size(len), data::binary>> = data
+    <<name::binary-size(^len), data::binary>> = data
     {name, data}
   end
 end

lib/quickbeam/web_socket.ex

@@ -281,8 +281,6 @@ defmodule QuickBEAM.WebSocket do
 
   # -- Close / send --
 
-  defp do_close(%{websocket: nil} = state, _code, _reason), do: {:ok, state}
-
   defp do_close(state, code, reason) do
     frame = if code == 1000 and reason == "", do: :close, else: {:close, code, reason}
 

mix.exs

@@ -1,7 +1,7 @@
 defmodule QuickBEAM.MixProject do
   use Mix.Project
 
-  @version "0.10.16"
+  @version "0.10.17"
 
   @source_url "https://github.com/elixir-volt/quickbeam"
 
@@ -70,7 +70,7 @@ defmodule QuickBEAM.MixProject do
       {:ex_dna, "~> 1.1", only: [:dev, :test], runtime: false},
       {:ex_slop, "~> 0.2", only: [:dev, :test], runtime: false},
       {:jason, "~> 1.4"},
-      {:oxc, "~> 0.16.0"},
+      {:oxc, "~> 0.17.0"},
       {:npm, "~> 0.7.4", optional: true},
       {:mint_web_socket, "~> 1.0"},
       {:nimble_pool, "~> 1.1"},

mix.lock

@@ -27,14 +27,14 @@
   "nimble_pool": {:hex, :nimble_pool, "1.1.0", "bf9c29fbdcba3564a8b800d1eeb5a3c58f36e1e11d7b7fb2e084a643f645f06b", [:mix], [], "hexpm", "af2e4e6b34197db81f7aad230c1118eac993acc0dae6bc83bac0126d4ae0813a"},
   "npm": {:hex, :npm, "0.7.4", "a8cc2e760a30789e6b590257cfae9384fd1de470dab8ef62a7b35859587f34b7", [:mix], [{:hex_solver, "~> 0.2", [hex: :hex_solver, repo: "hexpm", optional: false]}, {:jason, "~> 1.4", [hex: :jason, repo: "hexpm", optional: false]}, {:npm_semver, "~> 0.1.0", [hex: :npm_semver, repo: "hexpm", optional: false]}, {:req, "~> 0.5", [hex: :req, repo: "hexpm", optional: false]}], "hexpm", "ee265d380c19dbb9d1bba50458e1938711569a195423e6cfbf9ef7c3b8d7658a"},
   "npm_semver": {:hex, :npm_semver, "0.1.0", "3ab2c2a151d8c87c364209b2ca1a4fd2ab98507ed61afbd1ea12c1826e67200a", [:mix], [{:hex_solver, "~> 0.2", [hex: :hex_solver, repo: "hexpm", optional: false]}, {:nimble_parsec, "~> 1.0", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "77afbc4c523c19a572325190bc4c968ec027e1c6ef8538bcddacf835966072fa"},
-  "oxc": {:hex, :oxc, "0.16.0", "2ded8e2aa0313107d22efad05cf75eabe39f6a35ce3a03fa8b4de1b0997f3614", [:mix], [{:jason, "~> 1.4", [hex: :jason, repo: "hexpm", optional: false]}, {:rustler, "~> 0.36", [hex: :rustler, repo: "hexpm", optional: true]}, {:rustler_precompiled, "~> 0.8", [hex: :rustler_precompiled, repo: "hexpm", optional: false]}], "hexpm", "25cdedc3b51d2e33ec4b8137aab8e993aa8dc133bf58a7ab5994438dfd527b1a"},
+  "oxc": {:hex, :oxc, "0.17.0", "23f6bd5b1f0915dcc20ab9b5261b84f624edad76db153ef4c3f9fa67b9bd2bec", [:mix], [{:jason, "~> 1.4", [hex: :jason, repo: "hexpm", optional: false]}, {:rustler, "~> 0.36", [hex: :rustler, repo: "hexpm", optional: true]}, {:rustler_precompiled, "~> 0.8", [hex: :rustler_precompiled, repo: "hexpm", optional: false]}], "hexpm", "b53d1b5287936a775df94e7cdc4bb39f46da9b3a3d74d0e30edd6a5f95dfdba7"},
   "pegasus": {:hex, :pegasus, "0.2.6", "b4af6522326fbb2ffd1bb706e78ec05854fbcb4b03a7fe08f8db2e9de1d0be67", [:mix], [{:nimble_parsec, "~> 1.2", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "0ac159f0ccab7967cf90208327cc8a35788874814c8d78e19d47104d3fc049b9"},
   "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"},
   "plug_crypto": {:hex, :plug_crypto, "2.1.1", "19bda8184399cb24afa10be734f84a16ea0a2bc65054e23a62bb10f06bc89491", [:mix], [], "hexpm", "6470bce6ffe41c8bd497612ffde1a7e4af67f36a15eea5f921af71cf3e11247c"},
   "protoss": {:hex, :protoss, "1.1.0", "853533313989751c7da5b0e1ce71501a23f3dc41f128709478af40daccc6e959", [:mix], [], "hexpm", "c2f874383dd047fcfdf467b814dd33a208a4d24a467aef90d86185b41a0752ad"},
   "quickjs_ex": {:hex, :quickjs_ex, "0.3.1", "4357d7636a2f811ed879ae4cd6a47b3b24125a794238c1838307ebb61343d1c2", [:mix], [{:jason, "~> 1.4", [hex: :jason, repo: "hexpm", optional: false]}, {:rustler, ">= 0.0.0", [hex: :rustler, repo: "hexpm", optional: true]}, {:rustler_precompiled, "~> 0.8", [hex: :rustler_precompiled, repo: "hexpm", optional: false]}], "hexpm", "e49dc454b2e2e527742c576b57cc19a1da857e62fdbd377725aae44bad585e46"},
   "req": {:hex, :req, "0.5.17", "0096ddd5b0ed6f576a03dde4b158a0c727215b15d2795e59e0916c6971066ede", [:mix], [{:brotli, "~> 0.3.1", [hex: :brotli, repo: "hexpm", optional: true]}, {:ezstd, "~> 1.0", [hex: :ezstd, repo: "hexpm", optional: true]}, {:finch, "~> 0.17", [hex: :finch, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}, {:mime, "~> 2.0.6 or ~> 2.1", [hex: :mime, repo: "hexpm", optional: false]}, {:nimble_csv, "~> 1.0", [hex: :nimble_csv, repo: "hexpm", optional: true]}, {:plug, "~> 1.0", [hex: :plug, repo: "hexpm", optional: true]}], "hexpm", "0b8bc6ffdfebbc07968e59d3ff96d52f2202d0536f10fef4dc11dc02a2a43e39"},
-  "rustler": {:hex, :rustler, "0.37.3", "5f4e6634d43b26f0a69834dd1d3ed4e1710b022a053bf4a670220c9540c92602", [:mix], [{:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "a6872c6f53dcf00486d1e7f9e046e20e01bf1654bdacc4193016c2e8002b32a2"},
+  "rustler": {:hex, :rustler, "0.38.0", "7a8906998ff0d28e3021c0a73264abcda719bda344b2e58307c6805b0f87c9b4", [:mix], [{:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "704c03c1bf66be12b031c5a389347b91c81c5cb819a24b068b0de36fe4a5652a"},
   "rustler_precompiled": {:hex, :rustler_precompiled, "0.9.0", "3a052eda09f3d2436364645cc1f13279cf95db310eb0c17b0d8f25484b233aa0", [:mix], [{:rustler, "~> 0.23", [hex: :rustler, repo: "hexpm", optional: true]}], "hexpm", "471d97315bd3bf7b64623418b3693eedd8e47de3d1cb79a0ac8f9da7d770d94c"},
   "statistex": {:hex, :statistex, "1.1.0", "7fec1eb2f580a0d2c1a05ed27396a084ab064a40cfc84246dbfb0c72a5c761e5", [:mix], [], "hexpm", "f5950ea26ad43246ba2cce54324ac394a4e7408fdcf98b8e230f503a0cba9cf5"},
   "telemetry": {:hex, :telemetry, "1.4.2", "a0cb522801dffb1c49fe6e30561badffc7b6d0e180db1300df759faa22062855", [:rebar3], [], "hexpm", "928f6495066506077862c0d1646609eed891a4326bee3126ba54b60af61febb1"},