@cleandns/whois-rdap 1.0.51 → 1.0.52

package/dist/index.js

@@ -279,10 +279,18 @@ function findTimestamps(values) {
         events = Object.values(values);
     }
     for (const [event, field] of eventMap) {
-        const date = events.find((ev) => { var _a; return ((_a = ev === null || ev === void 0 ? void 0 : ev.eventAction) === null || _a === void 0 ? void 0 : _a.toLocaleLowerCase()) === event; });
-        if (date === null || date === void 0 ? void 0 : date.eventDate) {
-            ts[field] = new Date(date.eventDate.toString().replace(/\+0000Z$/, "Z"));
-        }
+        events.find((ev) => {
+            var _a;
+            const isMatch = ((_a = ev === null || ev === void 0 ? void 0 : ev.eventAction) === null || _a === void 0 ? void 0 : _a.toLocaleLowerCase()) === event && ev.eventDate;
+            if (isMatch) {
+                const d = new Date(ev.eventDate.toString().replace(/\+0000Z$/, "Z"));
+                // console.log(field, ev.eventDate, d);
+                if (!isNaN(d.valueOf())) {
+                    ts[field] = d;
+                    return true;
+                }
+            }
+        });
     }
     return ts;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cleandns/whois-rdap",
-  "version": "1.0.51",
+  "version": "1.0.52",
   "description": "",
   "type": "module",
   "main": "dist/index.js",

package/src/index.ts

@@ -438,12 +438,19 @@ function findTimestamps(values: any[]) {
   }
 
   for (const [event, field] of eventMap) {
-    const date = events.find(
-      (ev: any) => ev?.eventAction?.toLocaleLowerCase() === event
+    events.find(
+      (ev: any) => {
+        const isMatch = ev?.eventAction?.toLocaleLowerCase() === event && ev.eventDate;
+        if (isMatch) {
+          const d = new Date(ev.eventDate.toString().replace(/\+0000Z$/, "Z"));
+          // console.log(field, ev.eventDate, d);
+          if (!isNaN(d.valueOf())) {
+            ts[field] = d;
+            return true;
+          }
+        }
+      }
     );
-    if (date?.eventDate) {
-      ts[field] = new Date(date.eventDate.toString().replace(/\+0000Z$/, "Z"));
-    }
   }
 
   return ts;