fix merge

Author: magnetised

lib/phoenix/sync.ex

@@ -282,7 +282,7 @@ defmodule Phoenix.Sync do
   - `columns` - The columns included in the shape. E.g. `["id", "title", "completed"]`
   - `params` - The values associated with a parameterized where clause. E.g. `[true, 1, "alive"]`, `%{1 => true}`
   """
-  @spec interrupt(shape_definition() | (match_shape_params() -> boolean()), shape_options()) ::
+  @spec interrupt(shape_definition() | (match_shape_params() -> boolean()), shape_specification()) ::
           {:ok, non_neg_integer()}
   def interrupt(shape, shape_opts \\ []) do
     Phoenix.Sync.ShapeRequestRegistry.interrupt_matching(shape, shape_opts)
@@ -334,7 +334,7 @@ defmodule Phoenix.Sync do
 
   #{NimbleOptions.docs(PredefinedShape.schema())}
   """
-  @spec shape!(shape_definition(), shape_options()) :: PredefinedShape.t()
+  @spec shape!(shape_definition(), shape_specification()) :: PredefinedShape.t()
   def shape!(shape, shape_opts \\ []) do
     PredefinedShape.new!(shape, shape_opts)
   end

lib/phoenix/sync/client.ex

@@ -126,24 +126,23 @@ defmodule Phoenix.Sync.Client do
   @spec stream(Phoenix.Sync.shape_definition(), Electric.Client.stream_options()) :: Enum.t()
   def stream(shape, stream_opts \\ [])
 
+  def stream(table, stream_opts) when is_binary(table) and is_list(stream_opts) do
+    stream(Keyword.put(stream_opts, :table, table), [])
+  end
+
   def stream(shape, []) when is_list(shape) do
     {client, shape} = Keyword.pop_lazy(shape, :client, &new!/0)
 
-    {shape, shape_stream_opts} = resolve_shape(shape)
+    {shape, shape_stream_opts} = resolve_shape(shape, [])
 
     Electric.Client.stream(client, shape, shape_stream_opts)
   end
 
-  def stream(table, stream_opts) when is_binary(table) and is_list(stream_opts) do
-    stream(Keyword.put(stream_opts, :table, table), [])
-  end
-
   def stream(shape, stream_opts) when not is_list(shape) and is_list(stream_opts) do
     {client, stream_opts} = Keyword.pop_lazy(stream_opts, :client, &new!/0)
+    {shape, shape_stream_opts} = resolve_shape(shape, stream_opts)
 
-    {shape, shape_stream_opts} = resolve_shape(shape)
-    stream_opts = Keyword.merge(shape_stream_opts, stream_opts)
-    Electric.Client.stream(client, shape, stream_opts)
+    Electric.Client.stream(client, shape, shape_stream_opts)
   end
 
   defp resolve_shape(shape, stream_opts) do

lib/phoenix/sync/predefined_shape.ex

@@ -44,7 +44,7 @@ defmodule Phoenix.Sync.PredefinedShape do
   @type options() :: [option()]
 
   if Code.ensure_loaded?(Ecto) do
-    @type shape() :: options() | queryable()
+    @type shape() :: options() | Phoenix.Sync.queryable()
   else
     @type shape() :: options()
   end
@@ -55,9 +55,6 @@ defmodule Phoenix.Sync.PredefinedShape do
   @doc false
   def schema, do: @keyword_shape_schema
 
-  def schema, do: @schema
-  def keys, do: @keys
-
   def is_queryable?(schema) when is_atom(schema) do
     Code.ensure_loaded?(schema) && function_exported?(schema, :__schema__, 1) &&
       !is_nil(schema.__schema__(:source))

lib/phoenix/sync/sandbox.ex

@@ -458,7 +458,7 @@ if Code.ensure_loaded?(Ecto.Adapters.SQL.Sandbox) do
         |> Phoenix.Sync.PredefinedShape.new!()
         |> Phoenix.Sync.PredefinedShape.to_stream_params()
 
-      Sandbox.Producer.truncate(stack_id, {namespace, table})
+      Sandbox.Producer.truncate(stack_id, {namespace || "public", table})
     end
 
     @impl true

lib/phoenix/sync/shape.ex

@@ -492,7 +492,7 @@ defmodule Phoenix.Sync.Shape do
           types
           |> Enum.flat_map(fn
             :changes -> [:insert, :update, :delete]
-            type -> type
+            type -> [type]
           end)
           |> Enum.uniq()
 

test/phoenix/sync/client_test.exs

@@ -155,8 +155,11 @@ defmodule Phoenix.Sync.ClientTest do
       stream =
         Phoenix.Sync.Client.stream(
           from(t in Support.Todo, where: t.completed == true),
-          [namespace: "app", replica: :full, live: false, errors: :stream],
-          ctx.electric_opts
+          namespace: "app",
+          replica: :full,
+          live: false,
+          errors: :stream,
+          client: ctx.client
         )
 
       assert %Electric.Client.Stream{