akeyless-client-commons 1.1.39 → 1.1.40

package/dist/helpers/index.d.mts

@@ -236,7 +236,11 @@ interface TimeOptions {
     defaultReturnedValue?: string;
 }
 declare function timestamp_to_string(firebaseTimestamp: Timestamp | Date | string | firebase_timestamp, options?: TimeOptions): string;
-declare function timestamp_to_millis(firebaseTimestamp: Timestamp): number;
+declare function timestamp_to_millis(firebaseTimestamp: Timestamp | Date | string | firebase_timestamp, options?: {
+    fromFormat?: string;
+    tz?: string;
+    defaultReturnedValue?: number;
+}): number;
 declare function sort_by_timestamp(a: Timestamp, b: Timestamp, reverse?: boolean): number;
 
 declare const baseDomain: string;

package/dist/helpers/index.d.ts

@@ -236,7 +236,11 @@ interface TimeOptions {
     defaultReturnedValue?: string;
 }
 declare function timestamp_to_string(firebaseTimestamp: Timestamp | Date | string | firebase_timestamp, options?: TimeOptions): string;
-declare function timestamp_to_millis(firebaseTimestamp: Timestamp): number;
+declare function timestamp_to_millis(firebaseTimestamp: Timestamp | Date | string | firebase_timestamp, options?: {
+    fromFormat?: string;
+    tz?: string;
+    defaultReturnedValue?: number;
+}): number;
 declare function sort_by_timestamp(a: Timestamp, b: Timestamp, reverse?: boolean): number;
 
 declare const baseDomain: string;

package/dist/helpers/index.js

@@ -2367,12 +2367,32 @@ function timestamp_to_string(firebaseTimestamp, options) {
     }
     return import_moment_timezone.default.utc(date).format(format);
 }
-function timestamp_to_millis(firebaseTimestamp) {
+function timestamp_to_millis(firebaseTimestamp, options) {
+    var _options_fromFormat;
+    var fromFormat = (_options_fromFormat = options === null || options === void 0 ? void 0 : options.fromFormat) !== null && _options_fromFormat !== void 0 ? _options_fromFormat : "DD/MM/YYYY HH:mm:ss";
+    var _options_defaultReturnedValue;
+    var defaultReturnedValue = (_options_defaultReturnedValue = options === null || options === void 0 ? void 0 : options.defaultReturnedValue) !== null && _options_defaultReturnedValue !== void 0 ? _options_defaultReturnedValue : 0;
+    var tz = options === null || options === void 0 ? void 0 : options.tz;
     if (!firebaseTimestamp) {
-        return 0;
+        return defaultReturnedValue;
+    }
+    if (_instanceof(firebaseTimestamp, import_firestore2.Timestamp)) {
+        return firebaseTimestamp.toMillis();
+    } else if (_instanceof(firebaseTimestamp, Date)) {
+        var ms = firebaseTimestamp.getTime();
+        return isNaN(ms) ? defaultReturnedValue : ms;
+    } else if (typeof firebaseTimestamp === "string") {
+        var m = tz ? import_moment_timezone.default.tz(firebaseTimestamp, fromFormat, tz) : import_moment_timezone.default.utc(firebaseTimestamp, fromFormat);
+        return m.isValid() ? m.valueOf() : defaultReturnedValue;
+    } else if (firebaseTimestamp._seconds) {
+        var seconds = firebaseTimestamp._seconds;
+        var _firebaseTimestamp__nanoseconds;
+        var nanos = (_firebaseTimestamp__nanoseconds = firebaseTimestamp._nanoseconds) !== null && _firebaseTimestamp__nanoseconds !== void 0 ? _firebaseTimestamp__nanoseconds : 0;
+        return seconds * 1e3 + Math.floor(nanos / 1e6);
+    } else {
+        console.error("Invalid timestamp format: ", firebaseTimestamp);
+        return defaultReturnedValue;
     }
-    var timestamp = new import_firestore2.Timestamp(firebaseTimestamp === null || firebaseTimestamp === void 0 ? void 0 : firebaseTimestamp.seconds, firebaseTimestamp === null || firebaseTimestamp === void 0 ? void 0 : firebaseTimestamp.nanoseconds);
-    return timestamp.toMillis();
 }
 function sort_by_timestamp(a, b) {
     var reverse = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : false;

package/dist/helpers/index.mjs

@@ -1988,12 +1988,32 @@ function timestamp_to_string(firebaseTimestamp, options) {
     }
     return moment2.utc(date).format(format);
 }
-function timestamp_to_millis(firebaseTimestamp) {
+function timestamp_to_millis(firebaseTimestamp, options) {
+    var _options_fromFormat;
+    var fromFormat = (_options_fromFormat = options === null || options === void 0 ? void 0 : options.fromFormat) !== null && _options_fromFormat !== void 0 ? _options_fromFormat : "DD/MM/YYYY HH:mm:ss";
+    var _options_defaultReturnedValue;
+    var defaultReturnedValue = (_options_defaultReturnedValue = options === null || options === void 0 ? void 0 : options.defaultReturnedValue) !== null && _options_defaultReturnedValue !== void 0 ? _options_defaultReturnedValue : 0;
+    var tz = options === null || options === void 0 ? void 0 : options.tz;
     if (!firebaseTimestamp) {
-        return 0;
+        return defaultReturnedValue;
+    }
+    if (_instanceof(firebaseTimestamp, Timestamp2)) {
+        return firebaseTimestamp.toMillis();
+    } else if (_instanceof(firebaseTimestamp, Date)) {
+        var ms = firebaseTimestamp.getTime();
+        return isNaN(ms) ? defaultReturnedValue : ms;
+    } else if (typeof firebaseTimestamp === "string") {
+        var m = tz ? moment2.tz(firebaseTimestamp, fromFormat, tz) : moment2.utc(firebaseTimestamp, fromFormat);
+        return m.isValid() ? m.valueOf() : defaultReturnedValue;
+    } else if (firebaseTimestamp._seconds) {
+        var seconds = firebaseTimestamp._seconds;
+        var _firebaseTimestamp__nanoseconds;
+        var nanos = (_firebaseTimestamp__nanoseconds = firebaseTimestamp._nanoseconds) !== null && _firebaseTimestamp__nanoseconds !== void 0 ? _firebaseTimestamp__nanoseconds : 0;
+        return seconds * 1e3 + Math.floor(nanos / 1e6);
+    } else {
+        console.error("Invalid timestamp format: ", firebaseTimestamp);
+        return defaultReturnedValue;
     }
-    var timestamp = new Timestamp2(firebaseTimestamp === null || firebaseTimestamp === void 0 ? void 0 : firebaseTimestamp.seconds, firebaseTimestamp === null || firebaseTimestamp === void 0 ? void 0 : firebaseTimestamp.nanoseconds);
-    return timestamp.toMillis();
 }
 function sort_by_timestamp(a, b) {
     var reverse = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : false;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "akeyless-client-commons",
-    "version": "1.1.39",
+    "version": "1.1.40",
     "scripts": {
         "build": "tsup",
         "deploy": "npm run build && npm version patch --no-git-tag-version && npm publish",