Exclude override_kernel: false from opts in import __MODULE__, opts

witchcrafters · Feb 19, 2020 · dfd4453 · dfd4453
1 parent 2d94356
commit dfd4453
Show file tree

Hide file tree

Showing 12 changed files with 36 additions and 12 deletions.
diff --git a/lib/witchcraft/applicative.ex b/lib/witchcraft/applicative.ex
@@ -31,9 +31,11 @@ defclass Witchcraft.Applicative do
   @type t :: any()
 
   defmacro __using__(opts \\ []) do
+    module_imports = [except: Keyword.get(opts, :except, [])]
+
     quote do
       use Witchcraft.Apply, unquote(opts)
-      import unquote(__MODULE__), unquote(opts)
+      import unquote(__MODULE__), unquote(module_imports)
     end
   end
 

diff --git a/lib/witchcraft/apply.ex b/lib/witchcraft/apply.ex
@@ -128,9 +128,11 @@ defclass Witchcraft.Apply do
   @type fun :: any()
 
   defmacro __using__(opts \\ []) do
+    module_imports = [except: Keyword.get(opts, :except, [])]
+
     quote do
       use Witchcraft.Functor, unquote(opts)
-      import unquote(__MODULE__), unquote(opts)
+      import unquote(__MODULE__), unquote(module_imports)
     end
   end
 

diff --git a/lib/witchcraft/arrow.ex b/lib/witchcraft/arrow.ex
@@ -44,9 +44,11 @@ defclass Witchcraft.Arrow do
   @type t :: fun()
 
   defmacro __using__(opts \\ []) do
+    module_imports = [except: Keyword.get(opts, :except, [])]
+
     quote do
       use Witchcraft.Category, unquote(opts)
-      import unquote(__MODULE__), unquote(opts)
+      import unquote(__MODULE__), unquote(module_imports)
     end
   end
 

diff --git a/lib/witchcraft/bifunctor.ex b/lib/witchcraft/bifunctor.ex
@@ -26,9 +26,11 @@ defclass Witchcraft.Bifunctor do
   @type t :: any()
 
   defmacro __using__(opts \\ []) do
+    module_imports = [except: Keyword.get(opts, :except, [])]
+
     quote do
       use Witchcraft.Functor, unquote(opts)
-      import unquote(__MODULE__), unquote(opts)
+      import unquote(__MODULE__), unquote(module_imports)
     end
   end
 

diff --git a/lib/witchcraft/category.ex b/lib/witchcraft/category.ex
@@ -27,9 +27,11 @@ defclass Witchcraft.Category do
   @type t :: any()
 
   defmacro __using__(opts \\ []) do
+    module_imports = [except: Keyword.get(opts, :except, [])]
+
     quote do
       use Witchcraft.Semigroupoid, unquote(opts)
-      import unquote(__MODULE__), unquote(opts)
+      import unquote(__MODULE__), unquote(module_imports)
     end
   end
 

diff --git a/lib/witchcraft/chain.ex b/lib/witchcraft/chain.ex
@@ -43,9 +43,11 @@ defclass Witchcraft.Chain do
   @type link :: (any() -> Chain.t())
 
   defmacro __using__(opts \\ []) do
+    module_imports = [except: Keyword.get(opts, :except, [])]
+
     quote do
       use Witchcraft.Apply, unquote(opts)
-      import unquote(__MODULE__), unquote(opts)
+      import unquote(__MODULE__), unquote(module_imports)
     end
   end
 

diff --git a/lib/witchcraft/comonad.ex b/lib/witchcraft/comonad.ex
@@ -28,9 +28,11 @@ defclass Witchcraft.Comonad do
   @type t :: any()
 
   defmacro __using__(opts \\ []) do
+    module_imports = [except: Keyword.get(opts, :except, [])]
+
     quote do
       use Witchcraft.Extend, unquote(opts)
-      import unquote(__MODULE__), unquote(opts)
+      import unquote(__MODULE__), unquote(module_imports)
     end
   end
 

diff --git a/lib/witchcraft/extend.ex b/lib/witchcraft/extend.ex
@@ -33,9 +33,11 @@ defclass Witchcraft.Extend do
   @type colink :: (Extend.t() -> any())
 
   defmacro __using__(opts \\ []) do
+    module_imports = [except: Keyword.get(opts, :except, [])]
+
     quote do
       use Witchcraft.Functor, unquote(opts)
-      import unquote(__MODULE__), unquote(opts)
+      import unquote(__MODULE__), unquote(module_imports)
     end
   end
 

diff --git a/lib/witchcraft/functor.ex b/lib/witchcraft/functor.ex
@@ -23,8 +23,10 @@ defclass Witchcraft.Functor do
   @type t :: any()
 
   defmacro __using__(opts \\ []) do
+    module_imports = [except: Keyword.get(opts, :except, [])]
+
     quote do
-      import unquote(__MODULE__), unquote(opts)
+      import unquote(__MODULE__), unquote(module_imports)
     end
   end
 

diff --git a/lib/witchcraft/monad.ex b/lib/witchcraft/monad.ex
@@ -43,10 +43,12 @@ defclass Witchcraft.Monad do
   use Witchcraft.Chain
 
   defmacro __using__(opts \\ []) do
+    module_imports = [except: Keyword.get(opts, :except, [])]
+
     quote do
       use Witchcraft.Applicative, unquote(opts)
       use Witchcraft.Chain, unquote(opts)
-      import unquote(__MODULE__), unquote(opts)
+      import unquote(__MODULE__), unquote(module_imports)
     end
   end
 

diff --git a/lib/witchcraft/monoid.ex b/lib/witchcraft/monoid.ex
@@ -20,9 +20,11 @@ defclass Witchcraft.Monoid do
   @type t :: any()
 
   defmacro __using__(opts \\ []) do
+    module_imports = [except: Keyword.get(opts, :except, [])]
+
     quote do
       use Witchcraft.Semigroup, unquote(opts)
-      import unquote(__MODULE__), unquote(opts)
+      import unquote(__MODULE__), unquote(module_imports)
     end
   end
 

diff --git a/lib/witchcraft/traversable.ex b/lib/witchcraft/traversable.ex
@@ -34,10 +34,12 @@ defclass Witchcraft.Traversable do
   @type link :: (any() -> Traversable.t())
 
   defmacro __using__(opts \\ []) do
+    module_imports = [except: Keyword.get(opts, :except, [])]
+
     quote do
       use Witchcraft.Foldable, unquote(opts)
       use Witchcraft.Functor, unquote(opts)
-      import unquote(__MODULE__), unquote(opts)
+      import unquote(__MODULE__), unquote(module_imports)
     end
   end