1 files changed, 12 insertions, 6 deletions

diff --git a/src/Data/JLD/Flattening/NodeMap.hs b/src/Data/JLD/Flattening/NodeMap.hs
index 919aec7..65db9ab 100644
--- a/src/Data/JLD/Flattening/NodeMap.hs
+++ b/src/Data/JLD/Flattening/NodeMap.hs
@@ -2,8 +2,9 @@ module Data.JLD.Flattening.NodeMap (NodeMap, BNMParams (..), buildNodeMap, merge
 
 import Data.JLD.Prelude
 
-import Data.JLD.Control.Monad.RES (REST, execREST, withErrorRES')
+import Data.JLD.Control.Monad.RES (REST, runREST, withErrorRES')
 import Data.JLD.Error (JLDError (..))
+import Data.JLD.Flattening.Global (JLDFlatteningT)
 import Data.JLD.Model.IRI (isBlankIri)
 import Data.JLD.Model.Keyword (Keyword (..), isKeywordLike, isNotKeyword)
 import Data.JLD.Model.NodeMap (NodeMap, PropertyMap)
@@ -12,7 +13,7 @@ import Data.JLD.Model.NodeObject (isNodeObject)
 import Data.JLD.Util (valueIsScalar, valueToArray, valueToNonNullArray)
 
 import Control.Monad.Except (MonadError (..))
-import Data.Aeson (Array, Key, Object, Value (..))
+import Data.Aeson (Array, Object, Value (..))
 import Data.Aeson.Key qualified as K (toText)
 import Data.Aeson.KeyMap qualified as KM (filterWithKey, insert, lookup, member, singleton)
 import Data.Foldable.WithIndex (FoldableWithIndex (..), iforM_)
@@ -85,7 +86,10 @@ bnmBuildNodeMap value paramsFn = do
                     , bnmParamsActiveSubject = bnmEnvActiveSubject
                     , bnmParamsActiveProperty = bnmEnvActiveProperty
                     }
-    (nodeMap', list) <- buildNodeMap value params
+    (nodeMap', list) <-
+        buildNodeMap value params |> runExceptT >=> \case
+            Left err -> throwError <| Left err
+            Right a -> pure a
     bnmModifyNodeMap <| const nodeMap'
     pure list
 
@@ -269,10 +273,12 @@ buildNodeMap' element = case element of
     --
     _ -> pure ()
 
-buildNodeMap :: Monad m => Value -> (BNMParams -> BNMParams) -> m (NodeMap, Maybe Array)
+buildNodeMap :: Monad m => Value -> (BNMParams -> BNMParams) -> JLDFlatteningT e m (NodeMap, Maybe Array)
 buildNodeMap document paramsFn = do
-    BNMState{..} <- buildNodeMap' document |> execREST env st
-    pure (bnmStateNodeMap, bnmStateList)
+    (result, BNMState{..}) <- buildNodeMap' document |> runREST env st
+    case result of
+        Left (Left err) -> throwError err
+        _ -> pure (bnmStateNodeMap, bnmStateList)
   where
     BNMParams{..} =
         paramsFn