@anysoftinc/anydb-sdk 0.7.0 → 0.8.0

package/dist/client.js

@@ -80,57 +80,67 @@ export function stringifyEdn(obj) {
     }
     return String(obj);
 }
-// Normalize edn-data parsed value into JS with keywordized keys (no leading colon)
+// ===== Type Guards =====
+function isKeyword(v) {
+    return typeof v === "object" && v !== null && v._type === "keyword";
+}
+function isSymbol(v) {
+    return typeof v === "object" && v !== null && v._type === "symbol";
+}
+// Normalize edn-data parsed value into JS with consistent symbolic types
+// Keywords and symbols are returned as typed objects for round-trip consistency
 function normalizeEdn(value) {
     if (value === null || value === undefined)
         return value;
     // Preserve native Date instances returned by the parser
     if (value instanceof Date)
         return value;
-    // edn-data often wraps keywords/symbols/strings as { key: '...' } or { sym: '...' }
+    // edn-data wraps keywords/symbols as { key: '...' } or { sym: '...' }
     if (typeof value === "object" && value) {
+        // Keywords: return as Keyword object for consistency with kw()
         if (typeof value.key === "string") {
             const key = value.key; // e.g., ":db/ident"
-            return key.startsWith(":") ? key.slice(1) : key;
+            const bareKey = key.startsWith(":") ? key.slice(1) : key;
+            return { _type: "keyword", value: bareKey };
         }
+        // Symbols: return as Symbol object for consistency with sym()
         if (typeof value.sym === "string") {
-            return value.sym;
+            return { _type: "symbol", value: value.sym };
+        }
+        // Tagged values - check before generic object handling
+        if (value.tag === "inst" && typeof value.val === "string") {
+            const d = new Date(value.val);
+            return isNaN(d.getTime()) ? value.val : d;
+        }
+        if (value.tag === "uuid" && typeof value.val === "string") {
+            return { _type: "uuid", value: value.val };
         }
+        // Sets
         if (value instanceof Set) {
             return Array.from(value, (v) => normalizeEdn(v));
         }
         if (Array.isArray(value.set)) {
             return value.set.map((v) => normalizeEdn(v));
         }
+        // Maps (EDN maps come as array of [k,v] pairs)
         if (Array.isArray(value.map)) {
             const out = {};
             for (const [k, v] of value.map) {
                 const kNorm = normalizeEdn(k);
-                const kStr = typeof kNorm === "string" ? kNorm : String(kNorm);
-                const bareKey = kStr.startsWith(":") ? kStr.slice(1) : kStr;
-                out[bareKey] = normalizeEdn(v);
+                // Extract string key from symbolic types (Keyword, Symbol, UUID) for JS object keys
+                const kStr = (typeof kNorm === "object" && kNorm !== null && "_type" in kNorm && "value" in kNorm)
+                    ? kNorm.value
+                    : kNorm;
+                out[kStr] = normalizeEdn(v);
             }
             return out;
         }
     }
     if (Array.isArray(value))
         return value.map((v) => normalizeEdn(v));
-    // Tagged values
-    if (typeof value === "object" &&
-        value &&
-        value.tag === "inst" &&
-        typeof value.val === "string") {
-        const d = new Date(value.val);
-        return isNaN(d.getTime()) ? value.val : d;
-    }
-    if (typeof value === "object" &&
-        value &&
-        value.tag === "uuid" &&
-        typeof value.val === "string") {
-        return { _type: "uuid", value: value.val };
-    }
+    // Generic object fallback
     if (typeof value === "object") {
-        const out = Array.isArray(value) ? [] : {};
+        const out = {};
         for (const [k, v] of Object.entries(value)) {
             out[k] = normalizeEdn(v);
         }
@@ -139,12 +149,6 @@ function normalizeEdn(value) {
     return value;
 }
 // ===== Validation =====
-function isKeyword(v) {
-    return typeof v === "object" && v !== null && v._type === "keyword";
-}
-function isSymbol(v) {
-    return typeof v === "object" && v !== null && v._type === "symbol";
-}
 function validateSymbolicQuery(q) {
     if (!q ||
         typeof q !== "object" ||

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@anysoftinc/anydb-sdk",
-  "version": "0.7.0",
+  "version": "0.8.0",
   "description": "AnyDB TypeScript SDK for querying and transacting with Datomic databases",
   "main": "dist/client.js",
   "types": "dist/client.d.ts",