From 9f7b35b2d654b0785221eb089f0923d1a5c83bdc Mon Sep 17 00:00:00 2001
From: Tim Hawes <tim.hawes@genesys.com>
Date: Mon, 17 Jun 2024 15:11:08 -0400
Subject: [PATCH] Added exception handling.

---
 project.clj             |  2 +-
 src/cljaws/dynamodb.clj | 74 ++++++++++++++++++++++-------------------
 2 files changed, 40 insertions(+), 36 deletions(-)

diff --git a/project.clj b/project.clj
index a7c82c9..f93e1dd 100644
--- a/project.clj
+++ b/project.clj
@@ -1,4 +1,4 @@
-(defproject timotheosh/cljaws "0.5.3-SNAPSHOT"
+(defproject timotheosh/cljaws "0.5.4-SNAPSHOT"
   :description "Convenience functions for interacting with AWS API's from closh"
   :url "https://github.com/timotheosh/cljaws"
   :license {:name "MIT"
diff --git a/src/cljaws/dynamodb.clj b/src/cljaws/dynamodb.clj
index 13521b5..3468ae5 100644
--- a/src/cljaws/dynamodb.clj
+++ b/src/cljaws/dynamodb.clj
@@ -53,46 +53,50 @@
 (defn map->typed
   "Takes a value and assigns the appropriate data type for dynamodb"
   [value]
-  (cond
-    (string? value) {:S value}
-    (number? value) {:N (str value)}
-    (bytes? value) {:B value}
-    (boolean? value) {:BOOL value}
-    (nil? value) {:NULL true}
-    (map? value) {:M (into {} (map (fn [[k v]] [(name k) (map->typed v)]) value))}
-    (set? value) {:SS (mapv str value)}
-    (vector? value) {:L (mapv map->typed value)}
-    :else (throw (ex-info "Unsupported attribute type" {:value value}))))
+  (try
+    (cond
+      (string? value) {:S value}
+      (number? value) {:N (str value)}
+      (bytes? value) {:B value}
+      (boolean? value) {:BOOL value}
+      (nil? value) {:NULL true}
+      (map? value) {:M (into {} (map (fn [[k v]] [(name k) (map->typed v)]) value))}
+      (set? value) {:SS (mapv str value)}
+      (vector? value) {:L (mapv map->typed value)}
+      :else (throw (ex-info "Unsupported attribute type" {:value value})))
+    (catch Exception err (ex-data err))))
 
 (defn typed->map
   "Takes a DynamoDB typed value and converts it to the appropriate Clojure type"
   [typed-value]
-  (cond
-    (map? typed-value)
+  (try
     (cond
-      (:S typed-value) (:S typed-value)
-      (:N typed-value) (read-string (:N typed-value))
-      (:B typed-value) (:B typed-value)
-      (:BOOL typed-value) (:BOOL typed-value)
-      (:NULL typed-value) nil
-      (:M typed-value) (into {} (map (fn [[k v]] [(keyword k) (typed->map v)]) (:M typed-value)))
-      (:L typed-value) (mapv typed->map (:L typed-value))
-      (:SS typed-value) (set (:SS typed-value))
-      (:NS typed-value) (set (map read-string (:NS typed-value)))
-      (:BS typed-value) (set (:BS typed-value))
-      :else (into {} (map (fn [[k v]] [(keyword k) (typed->map v)]) typed-value)))
-
-    ;; Directly handle collections
-    (vector? typed-value) (mapv typed->map typed-value)
-    (set? typed-value) (set (map typed->map typed-value))
-
-    ;; Handle direct values
-    (string? typed-value) typed-value
-    (number? typed-value) typed-value
-    (boolean? typed-value) typed-value
-    (nil? typed-value) nil
-
-    :else (throw (ex-info "Unsupported attribute type" {:typed-value typed-value}))))
+      (map? typed-value)
+      (cond
+        (:S typed-value) (:S typed-value)
+        (:N typed-value) (read-string (:N typed-value))
+        (:B typed-value) (:B typed-value)
+        (:BOOL typed-value) (:BOOL typed-value)
+        (:NULL typed-value) nil
+        (:M typed-value) (into {} (map (fn [[k v]] [(keyword k) (typed->map v)]) (:M typed-value)))
+        (:L typed-value) (mapv typed->map (:L typed-value))
+        (:SS typed-value) (set (:SS typed-value))
+        (:NS typed-value) (set (map read-string (:NS typed-value)))
+        (:BS typed-value) (set (:BS typed-value))
+        :else (into {} (map (fn [[k v]] [(keyword k) (typed->map v)]) typed-value)))
+
+      ;; Directly handle collections
+      (vector? typed-value) (mapv typed->map typed-value)
+      (set? typed-value) (set (map typed->map typed-value))
+
+      ;; Handle direct values
+      (string? typed-value) typed-value
+      (number? typed-value) typed-value
+      (boolean? typed-value) typed-value
+      (nil? typed-value) nil
+
+      :else (throw (ex-info "Unsupported attribute type" {:typed-value typed-value})))
+    (catch Exception err (ex-data err))))
 
 (defn format-put-item
   "Formats data for putting an item into the DynamoDB table. Supports optional sort key."