@formo/analytics 1.19.3 → 1.19.5

package/README.md

@@ -30,6 +30,11 @@ Visit Formo's [Developer Docs](https://docs.formo.so) for detailed guides and in
 
 Learn how Formo handles [onchain attribution](https://docs.formo.so/data/attribution) and [data collection](https://docs.formo.so/data/what-we-collect).
 
+## Support
+
+Join the [Formo community Slack channel](https://formo.so/slack) for help and questions.
+
 ## Contributing
 
 [Contributions](https://github.com/getformo/sdk/blob/main/CONTRIBUTING.md) are welcome! Feel free to open fixes and feature suggestions.
+

package/dist/cjs/src/FormoAnalytics.js

@@ -53,6 +53,7 @@ var constants_1 = require("./constants");
 var lib_1 = require("./lib");
 var types_1 = require("./types");
 var utils_1 = require("./utils");
+var address_1 = require("./utils/address");
 var validators_1 = require("./validators");
 var chain_1 = require("./utils/chain");
 var FormoAnalytics = /** @class */ (function () {
@@ -63,7 +64,6 @@ var FormoAnalytics = /** @class */ (function () {
         this.options = options;
         this._providerListeners = {};
         this._providers = [];
-        this.currentAddress = "";
         this.currentUserId = "";
         this.config = {
             writeKey: writeKey,
@@ -167,6 +167,7 @@ var FormoAnalytics = /** @class */ (function () {
      */
     FormoAnalytics.prototype.connect = function (_a, properties_1, context_1, callback_1) {
         return __awaiter(this, arguments, void 0, function (_b, properties, context, callback) {
+            var validAddress;
             var chainId = _b.chainId, address = _b.address;
             return __generator(this, function (_c) {
                 switch (_c.label) {
@@ -178,7 +179,8 @@ var FormoAnalytics = /** @class */ (function () {
                             lib_1.logger.warn("Connect: Address cannot be empty");
                         }
                         this.currentChainId = chainId;
-                        this.currentAddress = address ? (0, utils_1.toChecksumAddress)(address) : undefined;
+                        validAddress = (0, address_1.getValidAddress)(address);
+                        this.currentAddress = validAddress ? (0, utils_1.toChecksumAddress)(validAddress) : undefined;
                         return [4 /*yield*/, this.trackEvent(constants_1.EventType.CONNECT, {
                                 chainId: chainId,
                                 address: this.currentAddress,
@@ -324,7 +326,7 @@ var FormoAnalytics = /** @class */ (function () {
      */
     FormoAnalytics.prototype.identify = function (params, properties, context, callback) {
         return __awaiter(this, void 0, void 0, function () {
-            var _i, _a, providerDetail, provider, address_1, err_1, userId, address, providerName, rdns, e_1;
+            var _i, _a, providerDetail, provider, address_2, err_1, userId, address, providerName, rdns, validAddress, e_1;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
@@ -345,12 +347,12 @@ var FormoAnalytics = /** @class */ (function () {
                         _b.trys.push([2, 6, , 7]);
                         return [4 /*yield*/, this.getAddress(provider)];
                     case 3:
-                        address_1 = _b.sent();
-                        if (!address_1) return [3 /*break*/, 5];
-                        lib_1.logger.info("Auto-identifying", address_1, providerDetail.info.name, providerDetail.info.rdns);
+                        address_2 = _b.sent();
+                        if (!address_2) return [3 /*break*/, 5];
+                        lib_1.logger.info("Auto-identifying", address_2, providerDetail.info.name, providerDetail.info.rdns);
                         // NOTE: do not set this.currentAddress without explicit connect or identify
                         return [4 /*yield*/, this.identify({
-                                address: address_1,
+                                address: address_2,
                                 providerName: providerDetail.info.name,
                                 rdns: providerDetail.info.rdns,
                             }, properties, context, callback)];
@@ -370,14 +372,15 @@ var FormoAnalytics = /** @class */ (function () {
                     case 9:
                         userId = params.userId, address = params.address, providerName = params.providerName, rdns = params.rdns;
                         lib_1.logger.info("Identify", address, userId, providerName, rdns);
-                        if (address)
-                            this.currentAddress = (0, utils_1.toChecksumAddress)(address);
+                        validAddress = (0, address_1.getValidAddress)(address);
+                        if (validAddress)
+                            this.currentAddress = (0, utils_1.toChecksumAddress)(validAddress);
                         if (userId) {
                             this.currentUserId = userId;
                             (0, lib_1.cookie)().set(constants_1.SESSION_USER_ID_KEY, userId);
                         }
                         return [4 /*yield*/, this.trackEvent(constants_1.EventType.IDENTIFY, {
-                                address: address ? (0, utils_1.toChecksumAddress)(address) : undefined,
+                                address: validAddress ? (0, utils_1.toChecksumAddress)(validAddress) : undefined,
                                 providerName: providerName,
                                 userId: userId,
                                 rdns: rdns,
@@ -490,7 +493,7 @@ var FormoAnalytics = /** @class */ (function () {
     };
     FormoAnalytics.prototype.onAccountsChanged = function (accounts) {
         return __awaiter(this, void 0, void 0, function () {
-            var address, _a;
+            var validAddress, address, _a;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
@@ -503,12 +506,12 @@ var FormoAnalytics = /** @class */ (function () {
                         _b.sent();
                         return [2 /*return*/];
                     case 2:
-                        // Validate the first account is a valid address before processing
-                        if (!(0, validators_1.isAddress)(accounts[0])) {
+                        validAddress = (0, address_1.getValidAddress)(accounts[0]);
+                        if (!validAddress) {
                             lib_1.logger.warn("onAccountsChanged: Invalid address received", accounts[0]);
                             return [2 /*return*/];
                         }
-                        address = (0, utils_1.toChecksumAddress)(accounts[0]);
+                        address = (0, utils_1.toChecksumAddress)(validAddress);
                         if (address === this.currentAddress) {
                             // We have already reported this address
                             return [2 /*return*/];
@@ -541,7 +544,7 @@ var FormoAnalytics = /** @class */ (function () {
     };
     FormoAnalytics.prototype.onChainChanged = function (chainIdHex) {
         return __awaiter(this, void 0, void 0, function () {
-            var address;
+            var address, validAddress;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -559,7 +562,8 @@ var FormoAnalytics = /** @class */ (function () {
                             lib_1.logger.info("OnChainChanged: Unable to fetch or store connected address");
                             return [2 /*return*/, Promise.resolve()];
                         }
-                        this.currentAddress = (0, utils_1.toChecksumAddress)(address);
+                        validAddress = (0, address_1.getValidAddress)(address);
+                        this.currentAddress = validAddress ? (0, utils_1.toChecksumAddress)(validAddress) : undefined;
                         _a.label = 2;
                     case 2:
                         // Proceed only if the address exists
@@ -972,7 +976,7 @@ var FormoAnalytics = /** @class */ (function () {
     });
     FormoAnalytics.prototype.getAddress = function (provider) {
         return __awaiter(this, void 0, void 0, function () {
-            var p, accounts, err_3;
+            var p, accounts, validAddress, err_3;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -990,8 +994,9 @@ var FormoAnalytics = /** @class */ (function () {
                     case 2:
                         accounts = _a.sent();
                         if (accounts && accounts.length > 0) {
-                            if ((0, validators_1.isAddress)(accounts[0])) {
-                                return [2 /*return*/, (0, utils_1.toChecksumAddress)(accounts[0])];
+                            validAddress = (0, address_1.getValidAddress)(accounts[0]);
+                            if (validAddress) {
+                                return [2 /*return*/, (0, utils_1.toChecksumAddress)(validAddress)];
                             }
                         }
                         return [3 /*break*/, 4];
@@ -1021,7 +1026,10 @@ var FormoAnalytics = /** @class */ (function () {
                         res = _a.sent();
                         if (!res || res.length === 0)
                             return [2 /*return*/, null];
-                        return [2 /*return*/, res.filter(function (e) { return (0, validators_1.isAddress)(e); }).map(utils_1.toChecksumAddress)];
+                        return [2 /*return*/, res
+                                .map(function (e) { return (0, address_1.getValidAddress)(e); })
+                                .filter(function (e) { return e !== null; })
+                                .map(utils_1.toChecksumAddress)];
                     case 3:
                         err_4 = _a.sent();
                         if (err_4.code !== 4001) {
@@ -1066,11 +1074,16 @@ var FormoAnalytics = /** @class */ (function () {
         });
     };
     FormoAnalytics.prototype.buildSignatureEventPayload = function (method, params, response) {
+        var rawAddress = method === "personal_sign"
+            ? params[1]
+            : params[0];
+        var validAddress = (0, address_1.getValidAddress)(rawAddress);
+        if (!validAddress) {
+            throw new Error("Invalid address in signature payload: ".concat(rawAddress));
+        }
         var basePayload = {
             chainId: this.currentChainId,
-            address: method === "personal_sign"
-                ? params[1]
-                : params[0],
+            address: (0, utils_1.toChecksumAddress)(validAddress),
         };
         if (method === "personal_sign") {
             var message = Buffer.from(params[0].slice(2), "hex").toString("utf8");
@@ -1080,12 +1093,16 @@ var FormoAnalytics = /** @class */ (function () {
     };
     FormoAnalytics.prototype.buildTransactionEventPayload = function (params) {
         return __awaiter(this, void 0, void 0, function () {
-            var _a, data, from, to, value, _b;
+            var _a, data, from, to, value, validAddress, _b;
             var _c;
             return __generator(this, function (_d) {
                 switch (_d.label) {
                     case 0:
                         _a = params[0], data = _a.data, from = _a.from, to = _a.to, value = _a.value;
+                        validAddress = (0, address_1.getValidAddress)(from);
+                        if (!validAddress) {
+                            throw new Error("Invalid address in transaction payload: ".concat(from));
+                        }
                         _c = {};
                         _b = this.currentChainId;
                         if (_b) return [3 /*break*/, 2];
@@ -1095,7 +1112,7 @@ var FormoAnalytics = /** @class */ (function () {
                         _d.label = 2;
                     case 2: return [2 /*return*/, (_c.chainId = _b,
                             _c.data = data,
-                            _c.address = from,
+                            _c.address = (0, utils_1.toChecksumAddress)(validAddress),
                             _c.to = to,
                             _c.value = value,
                             _c)];

package/dist/cjs/src/lib/event/EventFactory.js

@@ -17,6 +17,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.EventFactory = void 0;
 var constants_1 = require("../../constants");
 var utils_1 = require("../../utils");
+var address_1 = require("../../utils/address");
 var timestamp_1 = require("../../utils/timestamp");
 var validators_1 = require("../../validators");
 var logger_1 = require("../logger");
@@ -120,11 +121,13 @@ var EventFactory = /** @class */ (function () {
                 version: constants_2.VERSION,
             };
             commonEventData.anonymous_id = (0, utils_2.generateAnonymousId)(constants_1.LOCAL_ANONYMOUS_ID_KEY);
-            if (formoEvent.address) {
-                commonEventData.address = (0, utils_1.toChecksumAddress)(formoEvent.address);
+            // Handle address - convert undefined to null for consistency
+            var validAddress = (0, address_1.getValidAddress)(formoEvent.address);
+            if (validAddress) {
+                commonEventData.address = (0, utils_1.toChecksumAddress)(validAddress);
             }
             else {
-                commonEventData.address = formoEvent.address;
+                commonEventData.address = null;
             }
             var processedEvent = (0, mergeDeepRight_1.default)(formoEvent, commonEventData);
             if (processedEvent.event === undefined) {
@@ -300,7 +303,11 @@ var EventFactory = /** @class */ (function () {
                 formoEvent = this.generateTrackEvent(event.event, event.properties, event.context);
                 break;
         }
-        !formoEvent.address && (formoEvent.address = address ? (0, utils_1.toChecksumAddress)(address) : null);
+        // Set address if not already set by the specific event generator
+        if (formoEvent.address === undefined || formoEvent.address === null) {
+            var validAddress = (0, address_1.getValidAddress)(address);
+            formoEvent.address = validAddress ? (0, utils_1.toChecksumAddress)(validAddress) : null;
+        }
         formoEvent.user_id = userId || null;
         return formoEvent;
     };

package/dist/cjs/src/lib/version.d.ts

@@ -1,2 +1,2 @@
-export declare const version = "1.19.2";
+export declare const version = "1.19.5";
 //# sourceMappingURL=version.d.ts.map

package/dist/cjs/src/lib/version.js

@@ -2,5 +2,5 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.version = void 0;
 // Generated by genversion.
-exports.version = '1.19.2';
+exports.version = '1.19.5';
 //# sourceMappingURL=version.js.map

package/dist/cjs/src/utils/address.d.ts

@@ -1,3 +1,22 @@
 import { Address } from "../types";
+/**
+ * Type guard to check if an address is valid and non-empty after trimming.
+ * Note: This function checks if the trimmed value of the address is valid, but does not guarantee that the input address itself is trimmed.
+ * If you require a trimmed address, use `getValidAddress(address)` to obtain the trimmed value.
+ * @param address The address to validate
+ * @returns true if the trimmed address is valid and non-empty, false otherwise.
+ * @remarks
+ * This type guard only ensures that the trimmed value is a valid Address. The original input may still contain leading or trailing whitespace.
+ */
+export declare const isValidAddress: (address: Address | null | undefined) => address is Address;
+/**
+ * Validates and returns a trimmed valid address.
+ * This function trims the input address and validates it, returning the trimmed value if valid.
+ * @param address The address to validate and trim
+ * @returns The trimmed address if valid, null otherwise
+ * @remarks
+ * This function is the preferred way to get a validated, trimmed address for use in your application.
+ */
+export declare const getValidAddress: (address: Address | null | undefined) => string | null;
 export declare const toChecksumAddress: (address: Address) => string;
 //# sourceMappingURL=address.d.ts.map

package/dist/cjs/src/utils/address.js

@@ -1,10 +1,46 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.toChecksumAddress = void 0;
+exports.toChecksumAddress = exports.getValidAddress = exports.isValidAddress = void 0;
 var keccak_js_1 = require("ethereum-cryptography/keccak.js");
 var utils_js_1 = require("ethereum-cryptography/utils.js");
 var validators_1 = require("../validators");
 var object_1 = require("../validators/object");
+/**
+ * Private helper function to validate and trim an address
+ * @param address The address to validate and trim
+ * @returns The trimmed address if valid, null otherwise
+ */
+var _validateAndTrimAddress = function (address) {
+    if (typeof address === "string" && address.trim() !== "" && (0, validators_1.isAddress)(address.trim())) {
+        return address.trim();
+    }
+    return null;
+};
+/**
+ * Type guard to check if an address is valid and non-empty after trimming.
+ * Note: This function checks if the trimmed value of the address is valid, but does not guarantee that the input address itself is trimmed.
+ * If you require a trimmed address, use `getValidAddress(address)` to obtain the trimmed value.
+ * @param address The address to validate
+ * @returns true if the trimmed address is valid and non-empty, false otherwise.
+ * @remarks
+ * This type guard only ensures that the trimmed value is a valid Address. The original input may still contain leading or trailing whitespace.
+ */
+var isValidAddress = function (address) {
+    return _validateAndTrimAddress(address) !== null;
+};
+exports.isValidAddress = isValidAddress;
+/**
+ * Validates and returns a trimmed valid address.
+ * This function trims the input address and validates it, returning the trimmed value if valid.
+ * @param address The address to validate and trim
+ * @returns The trimmed address if valid, null otherwise
+ * @remarks
+ * This function is the preferred way to get a validated, trimmed address for use in your application.
+ */
+var getValidAddress = function (address) {
+    return _validateAndTrimAddress(address);
+};
+exports.getValidAddress = getValidAddress;
 var toChecksumAddress = function (address) {
     if (!(0, validators_1.isAddress)(address, false)) {
         throw new Error("Invalid address " + address);

package/dist/esm/src/FormoAnalytics.js

@@ -50,7 +50,8 @@ import { EVENTS_API_URL, EventType, LOCAL_ANONYMOUS_ID_KEY, SESSION_CURRENT_URL_
 import { cookie, EventManager, EventQueue, initStorageManager, logger, Logger, } from "./lib";
 import { SignatureStatus, TransactionStatus, } from "./types";
 import { toChecksumAddress } from "./utils";
-import { isAddress, isLocalhost } from "./validators";
+import { getValidAddress } from "./utils/address";
+import { isLocalhost } from "./validators";
 import { parseChainId } from "./utils/chain";
 var FormoAnalytics = /** @class */ (function () {
     function FormoAnalytics(writeKey, options) {
@@ -60,7 +61,6 @@ var FormoAnalytics = /** @class */ (function () {
         this.options = options;
         this._providerListeners = {};
         this._providers = [];
-        this.currentAddress = "";
         this.currentUserId = "";
         this.config = {
             writeKey: writeKey,
@@ -164,6 +164,7 @@ var FormoAnalytics = /** @class */ (function () {
      */
     FormoAnalytics.prototype.connect = function (_a, properties_1, context_1, callback_1) {
         return __awaiter(this, arguments, void 0, function (_b, properties, context, callback) {
+            var validAddress;
             var chainId = _b.chainId, address = _b.address;
             return __generator(this, function (_c) {
                 switch (_c.label) {
@@ -175,7 +176,8 @@ var FormoAnalytics = /** @class */ (function () {
                             logger.warn("Connect: Address cannot be empty");
                         }
                         this.currentChainId = chainId;
-                        this.currentAddress = address ? toChecksumAddress(address) : undefined;
+                        validAddress = getValidAddress(address);
+                        this.currentAddress = validAddress ? toChecksumAddress(validAddress) : undefined;
                         return [4 /*yield*/, this.trackEvent(EventType.CONNECT, {
                                 chainId: chainId,
                                 address: this.currentAddress,
@@ -321,7 +323,7 @@ var FormoAnalytics = /** @class */ (function () {
      */
     FormoAnalytics.prototype.identify = function (params, properties, context, callback) {
         return __awaiter(this, void 0, void 0, function () {
-            var _i, _a, providerDetail, provider, address_1, err_1, userId, address, providerName, rdns, e_1;
+            var _i, _a, providerDetail, provider, address_1, err_1, userId, address, providerName, rdns, validAddress, e_1;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
@@ -367,14 +369,15 @@ var FormoAnalytics = /** @class */ (function () {
                     case 9:
                         userId = params.userId, address = params.address, providerName = params.providerName, rdns = params.rdns;
                         logger.info("Identify", address, userId, providerName, rdns);
-                        if (address)
-                            this.currentAddress = toChecksumAddress(address);
+                        validAddress = getValidAddress(address);
+                        if (validAddress)
+                            this.currentAddress = toChecksumAddress(validAddress);
                         if (userId) {
                             this.currentUserId = userId;
                             cookie().set(SESSION_USER_ID_KEY, userId);
                         }
                         return [4 /*yield*/, this.trackEvent(EventType.IDENTIFY, {
-                                address: address ? toChecksumAddress(address) : undefined,
+                                address: validAddress ? toChecksumAddress(validAddress) : undefined,
                                 providerName: providerName,
                                 userId: userId,
                                 rdns: rdns,
@@ -487,7 +490,7 @@ var FormoAnalytics = /** @class */ (function () {
     };
     FormoAnalytics.prototype.onAccountsChanged = function (accounts) {
         return __awaiter(this, void 0, void 0, function () {
-            var address, _a;
+            var validAddress, address, _a;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
@@ -500,12 +503,12 @@ var FormoAnalytics = /** @class */ (function () {
                         _b.sent();
                         return [2 /*return*/];
                     case 2:
-                        // Validate the first account is a valid address before processing
-                        if (!isAddress(accounts[0])) {
+                        validAddress = getValidAddress(accounts[0]);
+                        if (!validAddress) {
                             logger.warn("onAccountsChanged: Invalid address received", accounts[0]);
                             return [2 /*return*/];
                         }
-                        address = toChecksumAddress(accounts[0]);
+                        address = toChecksumAddress(validAddress);
                         if (address === this.currentAddress) {
                             // We have already reported this address
                             return [2 /*return*/];
@@ -538,7 +541,7 @@ var FormoAnalytics = /** @class */ (function () {
     };
     FormoAnalytics.prototype.onChainChanged = function (chainIdHex) {
         return __awaiter(this, void 0, void 0, function () {
-            var address;
+            var address, validAddress;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -556,7 +559,8 @@ var FormoAnalytics = /** @class */ (function () {
                             logger.info("OnChainChanged: Unable to fetch or store connected address");
                             return [2 /*return*/, Promise.resolve()];
                         }
-                        this.currentAddress = toChecksumAddress(address);
+                        validAddress = getValidAddress(address);
+                        this.currentAddress = validAddress ? toChecksumAddress(validAddress) : undefined;
                         _a.label = 2;
                     case 2:
                         // Proceed only if the address exists
@@ -969,7 +973,7 @@ var FormoAnalytics = /** @class */ (function () {
     });
     FormoAnalytics.prototype.getAddress = function (provider) {
         return __awaiter(this, void 0, void 0, function () {
-            var p, accounts, err_3;
+            var p, accounts, validAddress, err_3;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -987,8 +991,9 @@ var FormoAnalytics = /** @class */ (function () {
                     case 2:
                         accounts = _a.sent();
                         if (accounts && accounts.length > 0) {
-                            if (isAddress(accounts[0])) {
-                                return [2 /*return*/, toChecksumAddress(accounts[0])];
+                            validAddress = getValidAddress(accounts[0]);
+                            if (validAddress) {
+                                return [2 /*return*/, toChecksumAddress(validAddress)];
                             }
                         }
                         return [3 /*break*/, 4];
@@ -1018,7 +1023,10 @@ var FormoAnalytics = /** @class */ (function () {
                         res = _a.sent();
                         if (!res || res.length === 0)
                             return [2 /*return*/, null];
-                        return [2 /*return*/, res.filter(function (e) { return isAddress(e); }).map(toChecksumAddress)];
+                        return [2 /*return*/, res
+                                .map(function (e) { return getValidAddress(e); })
+                                .filter(function (e) { return e !== null; })
+                                .map(toChecksumAddress)];
                     case 3:
                         err_4 = _a.sent();
                         if (err_4.code !== 4001) {
@@ -1063,11 +1071,16 @@ var FormoAnalytics = /** @class */ (function () {
         });
     };
     FormoAnalytics.prototype.buildSignatureEventPayload = function (method, params, response) {
+        var rawAddress = method === "personal_sign"
+            ? params[1]
+            : params[0];
+        var validAddress = getValidAddress(rawAddress);
+        if (!validAddress) {
+            throw new Error("Invalid address in signature payload: ".concat(rawAddress));
+        }
         var basePayload = {
             chainId: this.currentChainId,
-            address: method === "personal_sign"
-                ? params[1]
-                : params[0],
+            address: toChecksumAddress(validAddress),
         };
         if (method === "personal_sign") {
             var message = Buffer.from(params[0].slice(2), "hex").toString("utf8");
@@ -1077,12 +1090,16 @@ var FormoAnalytics = /** @class */ (function () {
     };
     FormoAnalytics.prototype.buildTransactionEventPayload = function (params) {
         return __awaiter(this, void 0, void 0, function () {
-            var _a, data, from, to, value, _b;
+            var _a, data, from, to, value, validAddress, _b;
             var _c;
             return __generator(this, function (_d) {
                 switch (_d.label) {
                     case 0:
                         _a = params[0], data = _a.data, from = _a.from, to = _a.to, value = _a.value;
+                        validAddress = getValidAddress(from);
+                        if (!validAddress) {
+                            throw new Error("Invalid address in transaction payload: ".concat(from));
+                        }
                         _c = {};
                         _b = this.currentChainId;
                         if (_b) return [3 /*break*/, 2];
@@ -1092,7 +1109,7 @@ var FormoAnalytics = /** @class */ (function () {
                         _d.label = 2;
                     case 2: return [2 /*return*/, (_c.chainId = _b,
                             _c.data = data,
-                            _c.address = from,
+                            _c.address = toChecksumAddress(validAddress),
                             _c.to = to,
                             _c.value = value,
                             _c)];

package/dist/esm/src/lib/event/EventFactory.js

@@ -11,6 +11,7 @@ var __assign = (this && this.__assign) || function () {
 };
 import { COUNTRY_LIST, LOCAL_ANONYMOUS_ID_KEY, SESSION_TRAFFIC_SOURCE_KEY, } from "../../constants";
 import { toChecksumAddress, toSnakeCase } from "../../utils";
+import { getValidAddress } from "../../utils/address";
 import { getCurrentTimeFormatted } from "../../utils/timestamp";
 import { isUndefined } from "../../validators";
 import { logger } from "../logger";
@@ -114,11 +115,13 @@ var EventFactory = /** @class */ (function () {
                 version: VERSION,
             };
             commonEventData.anonymous_id = generateAnonymousId(LOCAL_ANONYMOUS_ID_KEY);
-            if (formoEvent.address) {
-                commonEventData.address = toChecksumAddress(formoEvent.address);
+            // Handle address - convert undefined to null for consistency
+            var validAddress = getValidAddress(formoEvent.address);
+            if (validAddress) {
+                commonEventData.address = toChecksumAddress(validAddress);
             }
             else {
-                commonEventData.address = formoEvent.address;
+                commonEventData.address = null;
             }
             var processedEvent = mergeDeepRight(formoEvent, commonEventData);
             if (processedEvent.event === undefined) {
@@ -294,7 +297,11 @@ var EventFactory = /** @class */ (function () {
                 formoEvent = this.generateTrackEvent(event.event, event.properties, event.context);
                 break;
         }
-        !formoEvent.address && (formoEvent.address = address ? toChecksumAddress(address) : null);
+        // Set address if not already set by the specific event generator
+        if (formoEvent.address === undefined || formoEvent.address === null) {
+            var validAddress = getValidAddress(address);
+            formoEvent.address = validAddress ? toChecksumAddress(validAddress) : null;
+        }
         formoEvent.user_id = userId || null;
         return formoEvent;
     };

package/dist/esm/src/lib/version.d.ts

@@ -1,2 +1,2 @@
-export declare const version = "1.19.2";
+export declare const version = "1.19.5";
 //# sourceMappingURL=version.d.ts.map

package/dist/esm/src/lib/version.js

@@ -1,3 +1,3 @@
 // Generated by genversion.
-export var version = '1.19.2';
+export var version = '1.19.5';
 //# sourceMappingURL=version.js.map

package/dist/esm/src/utils/address.d.ts

@@ -1,3 +1,22 @@
 import { Address } from "../types";
+/**
+ * Type guard to check if an address is valid and non-empty after trimming.
+ * Note: This function checks if the trimmed value of the address is valid, but does not guarantee that the input address itself is trimmed.
+ * If you require a trimmed address, use `getValidAddress(address)` to obtain the trimmed value.
+ * @param address The address to validate
+ * @returns true if the trimmed address is valid and non-empty, false otherwise.
+ * @remarks
+ * This type guard only ensures that the trimmed value is a valid Address. The original input may still contain leading or trailing whitespace.
+ */
+export declare const isValidAddress: (address: Address | null | undefined) => address is Address;
+/**
+ * Validates and returns a trimmed valid address.
+ * This function trims the input address and validates it, returning the trimmed value if valid.
+ * @param address The address to validate and trim
+ * @returns The trimmed address if valid, null otherwise
+ * @remarks
+ * This function is the preferred way to get a validated, trimmed address for use in your application.
+ */
+export declare const getValidAddress: (address: Address | null | undefined) => string | null;
 export declare const toChecksumAddress: (address: Address) => string;
 //# sourceMappingURL=address.d.ts.map

package/dist/esm/src/utils/address.js

@@ -2,6 +2,40 @@ import { keccak256 } from "ethereum-cryptography/keccak.js";
 import { utf8ToBytes } from "ethereum-cryptography/utils.js";
 import { ensureIfUint8Array, isAddress, uint8ArrayToHexString, } from "../validators";
 import { isNullish } from "../validators/object";
+/**
+ * Private helper function to validate and trim an address
+ * @param address The address to validate and trim
+ * @returns The trimmed address if valid, null otherwise
+ */
+var _validateAndTrimAddress = function (address) {
+    if (typeof address === "string" && address.trim() !== "" && isAddress(address.trim())) {
+        return address.trim();
+    }
+    return null;
+};
+/**
+ * Type guard to check if an address is valid and non-empty after trimming.
+ * Note: This function checks if the trimmed value of the address is valid, but does not guarantee that the input address itself is trimmed.
+ * If you require a trimmed address, use `getValidAddress(address)` to obtain the trimmed value.
+ * @param address The address to validate
+ * @returns true if the trimmed address is valid and non-empty, false otherwise.
+ * @remarks
+ * This type guard only ensures that the trimmed value is a valid Address. The original input may still contain leading or trailing whitespace.
+ */
+export var isValidAddress = function (address) {
+    return _validateAndTrimAddress(address) !== null;
+};
+/**
+ * Validates and returns a trimmed valid address.
+ * This function trims the input address and validates it, returning the trimmed value if valid.
+ * @param address The address to validate and trim
+ * @returns The trimmed address if valid, null otherwise
+ * @remarks
+ * This function is the preferred way to get a validated, trimmed address for use in your application.
+ */
+export var getValidAddress = function (address) {
+    return _validateAndTrimAddress(address);
+};
 export var toChecksumAddress = function (address) {
     if (!isAddress(address, false)) {
         throw new Error("Invalid address " + address);