From d725b0bd19d95a07db55f812c3e065ecb7105911 Mon Sep 17 00:00:00 2001
From: c4710n <c4710n@users.noreply.github.com>
Date: Thu, 23 May 2024 08:46:38 +0800
Subject: [PATCH] Fix value of "received options" in error message

---
 lib/nimble_options.ex        | 29 ++++++++++++++++-------------
 test/nimble_options_test.exs | 16 ++++++++++++++++
 2 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/lib/nimble_options.ex b/lib/nimble_options.ex
index ada3da3..c609ded 100644
--- a/lib/nimble_options.ex
+++ b/lib/nimble_options.ex
@@ -505,7 +505,7 @@ defmodule NimbleOptions do
     schema = expand_star_to_option_keys(schema, opts)
 
     with :ok <- validate_unknown_options(opts, schema),
-         {:ok, options} <- validate_options(schema, opts) do
+         {:ok, options} <- validate_options(opts, schema) do
       {:ok, options}
     else
       {:error, %ValidationError{} = error} ->
@@ -529,33 +529,36 @@ defmodule NimbleOptions do
     end
   end
 
-  defp validate_options(schema, opts) do
-    case Enum.reduce_while(schema, opts, &reduce_options/2) do
+  defp validate_options(opts, schema) do
+    orig_opts = opts
+
+    case Enum.reduce_while(schema, {opts, orig_opts}, &reduce_options/2) do
       {:error, %ValidationError{}} = result -> result
-      result -> {:ok, result}
+      {opts, _orig_opts} -> {:ok, opts}
     end
   end
 
-  defp reduce_options({key, schema_opts}, opts) do
-    case validate_option(opts, key, schema_opts) do
+  defp reduce_options({key, schema_opts}, {opts, orig_opts}) do
+    case validate_option({opts, orig_opts}, key, schema_opts) do
       {:error, %ValidationError{}} = result ->
         {:halt, result}
 
       {:ok, value} ->
-        {:cont, Keyword.update(opts, key, value, fn _ -> value end)}
+        opts = Keyword.update(opts, key, value, fn _ -> value end)
+        {:cont, {opts, orig_opts}}
 
       :no_value ->
         if Keyword.has_key?(schema_opts, :default) do
           opts_with_default = Keyword.put(opts, key, schema_opts[:default])
-          reduce_options({key, schema_opts}, opts_with_default)
+          reduce_options({key, schema_opts}, {opts_with_default, orig_opts})
         else
-          {:cont, opts}
+          {:cont, {opts, orig_opts}}
         end
     end
   end
 
-  defp validate_option(opts, key, schema) do
-    with {:ok, value} <- validate_value(opts, key, schema),
+  defp validate_option({opts, orig_opts}, key, schema) do
+    with {:ok, value} <- validate_value({opts, orig_opts}, key, schema),
          {:ok, value} <- validate_type(schema[:type], key, value) do
       if nested_schema = schema[:keys] do
         validate_options_with_schema_and_path(value, nested_schema, _path = [key])
@@ -565,7 +568,7 @@ defmodule NimbleOptions do
     end
   end
 
-  defp validate_value(opts, key, schema) do
+  defp validate_value({opts, orig_opts}, key, schema) do
     cond do
       Keyword.has_key?(opts, key) ->
         if message = Keyword.get(schema, :deprecated) do
@@ -579,7 +582,7 @@ defmodule NimbleOptions do
           key,
           nil,
           "required #{render_key(key)} not found, received options: " <>
-            inspect(Keyword.keys(opts))
+            inspect(Keyword.keys(orig_opts))
         )
 
       true ->
diff --git a/test/nimble_options_test.exs b/test/nimble_options_test.exs
index 6850b01..18379df 100644
--- a/test/nimble_options_test.exs
+++ b/test/nimble_options_test.exs
@@ -116,6 +116,22 @@ defmodule NimbleOptionsTest do
                }
              }
     end
+
+    test "is not treated as values of received options when showing validation error" do
+      # It is intentional to define options with default values at the beginning of the list.
+      # Don't change the order of them.
+      schema = [age: [type: :non_neg_integer, default: 10], name: [type: :string, required: true]]
+
+      assert NimbleOptions.validate([], schema) == {
+               :error,
+               %NimbleOptions.ValidationError{
+                 key: :name,
+                 keys_path: [],
+                 message: "required :name option not found, received options: []",
+                 value: nil
+               }
+             }
+    end
   end
 
   describe ":required" do