@microsoft/applicationinsights-clickanalytics-js 2.8.0-beta.2203-08 → 2.8.0-beta.2203-11

package/dist-esm/handlers/DomContentHandler.js.map

@@ -1 +1 @@
-{"version":3,"file":"DomContentHandler.js.map","sources":["DomContentHandler.js"],"sourcesContent":["/**\r\n * @copyright Microsoft 2020\r\n */\r\nimport { removeInvalidElements, walkUpDomChainWithElementValidation, extend, _ExtendedInternalMessageId, isValueAssigned } from \"../common/Utils\";\r\nimport { LoggingSeverity, getDocument, isNullOrUndefined, hasDocument } from \"@microsoft/applicationinsights-core-js\";\r\nvar MAX_CONTENTNAME_LENGTH = 200;\r\nvar DomContentHandler = /** @class */ (function () {\r\n    /**\r\n     * @param config - ClickAnalytics configuration object\r\n     * @param traceLogger - Trace logger to log to console.\r\n     */\r\n    function DomContentHandler(_config, _traceLogger) {\r\n        this._config = _config;\r\n        this._traceLogger = _traceLogger;\r\n    }\r\n    /**\r\n     * Collect metatags from DOM.\r\n     * Collect data from meta tags.\r\n     * @returns {object} - Metatags collection/property bag\r\n     */\r\n    DomContentHandler.prototype.getMetadata = function () {\r\n        var metaTags = {};\r\n        if (hasDocument) {\r\n            metaTags = isValueAssigned(this._config.dataTags.metaDataPrefix) ? this._getMetaDataFromDOM(this._config.dataTags.captureAllMetaDataContent, this._config.dataTags.metaDataPrefix, false) :\r\n                this._getMetaDataFromDOM(this._config.dataTags.captureAllMetaDataContent, \"\", false);\r\n        }\r\n        return metaTags;\r\n    };\r\n    /**\r\n     * Collect data-* attributes for the given element.\r\n     * All attributes with data-* prefix or user provided customDataPrefix are collected.'data-*' prefix is removed from the key name.\r\n     * @param element - The element from which attributes need to be collected.\r\n     * @returns String representation of the Json array of element attributes\r\n     */\r\n    DomContentHandler.prototype.getElementContent = function (element) {\r\n        if (!element) {\r\n            return {};\r\n        }\r\n        var elementContent = {};\r\n        var biBlobValue;\r\n        var parentDataTagPrefix;\r\n        var dataTagPrefix = this._config.dataTags.customDataPrefix;\r\n        var aiBlobAttributeTag = dataTagPrefix + this._config.dataTags.aiBlobAttributeTag;\r\n        if (isValueAssigned(this._config.dataTags.parentDataTag)) {\r\n            parentDataTagPrefix = dataTagPrefix + this._config.dataTags.parentDataTag;\r\n        }\r\n        if (!this._isTracked(element, dataTagPrefix, aiBlobAttributeTag)) {\r\n            // capture blob from element or hierarchy\r\n            biBlobValue = element.getAttribute(aiBlobAttributeTag);\r\n            if (biBlobValue) {\r\n                try {\r\n                    elementContent = JSON.parse(biBlobValue);\r\n                }\r\n                catch (e) {\r\n                    this._traceLogger.throwInternal(LoggingSeverity.CRITICAL, _ExtendedInternalMessageId.CannotParseAiBlobValue, \"Can not parse \" + biBlobValue);\r\n                }\r\n            }\r\n            else {\r\n                // traverse up the DOM to find the closest parent with data-* tag defined\r\n                //contentElement = walkUpDomChainWithElementValidation(element, this._isTracked, dataTagPrefix);\r\n                elementContent = extend(elementContent, this._populateElementContent(element, dataTagPrefix, parentDataTagPrefix, aiBlobAttributeTag));\r\n            }\r\n        }\r\n        else {\r\n            elementContent = extend(elementContent, this._populateElementContentwithDataTag(element, dataTagPrefix, parentDataTagPrefix, aiBlobAttributeTag));\r\n        }\r\n        removeInvalidElements(elementContent);\r\n        if (parentDataTagPrefix) {\r\n            elementContent = extend(elementContent, this._getParentDetails(element, elementContent, dataTagPrefix, aiBlobAttributeTag));\r\n        }\r\n        return elementContent;\r\n    };\r\n    /**\r\n     * Capture current level Element content\r\n     */\r\n    DomContentHandler.prototype._captureElementContentWithDataTag = function (contentElement, elementContent, dataTagPrefix) {\r\n        for (var i = 0, attrib; i < contentElement.attributes.length; i++) {\r\n            attrib = contentElement.attributes[i];\r\n            if (attrib.name.indexOf(dataTagPrefix) !== 0) {\r\n                continue;\r\n            }\r\n            var attribName = attrib.name.replace(dataTagPrefix, \"\");\r\n            elementContent[attribName] = attrib.value;\r\n        }\r\n    };\r\n    /**\r\n     * Walk Up the DOM to capture Element content\r\n     */\r\n    DomContentHandler.prototype._walkUpDomChainCaptureData = function (el, elementContent, dataTagPrefix, parentDataTagPrefix, aiBlobAttributeTag) {\r\n        var element = el;\r\n        var parentDataTagFound = false;\r\n        var elementLevelFlag = false; // Use this flag to capture 'id' only at the incoming html element level.\r\n        while (!isNullOrUndefined(element) && !isNullOrUndefined(element.attributes)) {\r\n            var attributes = element.attributes;\r\n            for (var i = 0; i < attributes.length; i++) {\r\n                var attrib = attributes[i];\r\n                if (attrib.name.indexOf(dataTagPrefix) !== 0) {\r\n                    continue;\r\n                }\r\n                if (attrib.name.indexOf(parentDataTagPrefix) === 0) {\r\n                    parentDataTagFound = true;\r\n                }\r\n                // Todo handle blob data\r\n                if (attrib.name.indexOf(aiBlobAttributeTag) === 0) {\r\n                    continue;\r\n                }\r\n                var attribName = attrib.name.replace(dataTagPrefix, \"\");\r\n                if (elementLevelFlag && attribName === \"id\")\r\n                    continue; // skip capturing id if not at the first level.\r\n                if (!isValueAssigned(elementContent[attribName])) {\r\n                    elementContent[attribName] = attrib.value;\r\n                }\r\n            }\r\n            // break after current level;\r\n            if (parentDataTagFound) {\r\n                break;\r\n            }\r\n            elementLevelFlag = true; // after the initial level set this flag to true.\r\n            element = element.parentNode;\r\n        }\r\n    };\r\n    /**\r\n    * Capture Element content along with Data Tag attributes and values\r\n    */\r\n    DomContentHandler.prototype._populateElementContent = function (element, dataTagPrefix, parentDataTagPrefix, aiBlobAttributeTag) {\r\n        var elementContent = {};\r\n        if (!element)\r\n            return elementContent;\r\n        var htmlContent = this._getHtmlIdAndContentName(element);\r\n        elementContent = {\r\n            id: htmlContent.id || \"\",\r\n            contentName: htmlContent.contentName || \"\"\r\n        };\r\n        if (isValueAssigned(parentDataTagPrefix)) {\r\n            this._walkUpDomChainCaptureData(element, elementContent, dataTagPrefix, parentDataTagPrefix, aiBlobAttributeTag);\r\n        }\r\n        // Validate to ensure the minimum required field 'id' or 'contentName' is present.\r\n        // The content schema defines id, aN and sN as required fields.  However,\r\n        // requiring these fields would result in majority of adopter's content from being collected.\r\n        // Just throw a warning and continue collection.\r\n        if (!elementContent.id && !elementContent.contentName) {\r\n            this._traceLogger.throwInternal(LoggingSeverity.WARNING, _ExtendedInternalMessageId.InvalidContentBlob, \"Invalid content blob.  Missing required attributes (id, contentName. \" +\r\n                \" Content information will still be collected!\");\r\n        }\r\n        return elementContent;\r\n    };\r\n    /**\r\n     * Capture Element content along with Data Tag attributes and values\r\n     */\r\n    DomContentHandler.prototype._populateElementContentwithDataTag = function (element, dataTagPrefix, parentDataTagPrefix, aiBlobAttributeTag) {\r\n        var elementContent = {};\r\n        if (!element)\r\n            return elementContent;\r\n        var htmlContent = this._getHtmlIdAndContentName(element);\r\n        if (isValueAssigned(parentDataTagPrefix)) {\r\n            this._walkUpDomChainCaptureData(element, elementContent, dataTagPrefix, parentDataTagPrefix, aiBlobAttributeTag);\r\n        }\r\n        else {\r\n            this._captureElementContentWithDataTag(element, elementContent, dataTagPrefix);\r\n        }\r\n        if (this._config.dataTags.useDefaultContentNameOrId) {\r\n            if (!isValueAssigned(elementContent.id)) {\r\n                elementContent.id = htmlContent.id || \"\";\r\n            }\r\n            elementContent.contentName = htmlContent.contentName || \"\";\r\n        }\r\n        // Validate to ensure the minimum required field 'id' or 'contentName' is present.\r\n        // The content schema defines id, aN and sN as required fields.  However,\r\n        // requiring these fields would result in majority of adopter's content from being collected.\r\n        // Just throw a warning and continue collection.\r\n        if (!elementContent.id && !elementContent.contentName) {\r\n            this._traceLogger.throwInternal(LoggingSeverity.WARNING, _ExtendedInternalMessageId.InvalidContentBlob, \"Invalid content blob.  Missing required attributes (id, contentName. \" +\r\n                \" Content information will still be collected!\");\r\n        }\r\n        return elementContent;\r\n    };\r\n    /**\r\n     * Retrieve a specified metadata tag value from the DOM.\r\n     * @param captureAllMetaDataContent - Flag to capture all metadata content\r\n     * @param prefix - Prefix to search the metatags with.\r\n     * @param removePrefix - Specifies if the prefix must be excluded from key names in the returned collection.\r\n     * @returns Metadata collection/property bag\r\n     */\r\n    DomContentHandler.prototype._getMetaDataFromDOM = function (captureAllMetaDataContent, prefix, removePrefix) {\r\n        var metaElements;\r\n        var metaData = {};\r\n        if (hasDocument) {\r\n            metaElements = document.querySelectorAll(\"meta\");\r\n            for (var i = 0; i < metaElements.length; i++) {\r\n                var meta = metaElements[i];\r\n                if (meta.name) {\r\n                    if (captureAllMetaDataContent || meta.name.indexOf(prefix) === 0) {\r\n                        var name_1 = removePrefix ? meta.name.replace(prefix, \"\") : meta.name;\r\n                        metaData[name_1] = meta.content;\r\n                    }\r\n                }\r\n            }\r\n        }\r\n        return metaData;\r\n    };\r\n    /**\r\n     * Gets the default content name.\r\n     * @param element - An html element\r\n     * @param useDefaultContentNameOrId -Flag indicating if an element is market PII.\r\n     * @returns Content name\r\n     */\r\n    DomContentHandler.prototype._getDefaultContentName = function (element, useDefaultContentName) {\r\n        if (useDefaultContentName === false || !element.tagName) {\r\n            return \"\";\r\n        }\r\n        var doc = getDocument() || {};\r\n        var contentName;\r\n        switch (element.tagName) {\r\n            case \"A\":\r\n                contentName = doc.all ? element.innerText || element.innerHTML : element.text || element.innerHTML;\r\n                break;\r\n            case \"IMG\":\r\n            case \"AREA\":\r\n                contentName = element.alt;\r\n                break;\r\n            default:\r\n                contentName = element.value || element.name || element.alt || element.innerText || element.id;\r\n        }\r\n        return contentName.substring(0, MAX_CONTENTNAME_LENGTH);\r\n    };\r\n    /**\r\n     * Check if the user wants to track the element, which means if the element has any tags with data-* or customDataPrefix\r\n     * @param element - An html element\r\n     * @returns true if any data-* exist, otherwise return false\r\n     */\r\n    DomContentHandler.prototype._isTracked = function (element, dataTag, aiBlobAttributeTag) {\r\n        var attrs = element.attributes;\r\n        var dataTagFound = false;\r\n        for (var i = 0; i < attrs.length; i++) {\r\n            var attributeName = attrs[i].name;\r\n            if (attributeName === aiBlobAttributeTag) {\r\n                // ignore if the attribute name is equal to aiBlobAttributeTag\r\n                return false;\r\n            }\r\n            else if (attributeName.indexOf(dataTag) === 0) {\r\n                dataTagFound = true;\r\n            }\r\n        }\r\n        return dataTagFound;\r\n    };\r\n    DomContentHandler.prototype._getHtmlIdAndContentName = function (element) {\r\n        var htmlContent = {};\r\n        if (!element)\r\n            return htmlContent;\r\n        if (this._config.dataTags.useDefaultContentNameOrId) {\r\n            var customizedContentName = this._config.callback.contentName ? this._config.callback.contentName(element, this._config.dataTags.useDefaultContentNameOrId) : \"\";\r\n            var defaultContentName = this._getDefaultContentName(element, this._config.dataTags.useDefaultContentNameOrId);\r\n            htmlContent = {\r\n                id: element.id,\r\n                contentName: customizedContentName || defaultContentName || element.getAttribute(\"alt\")\r\n            };\r\n        }\r\n        return htmlContent;\r\n    };\r\n    /**\r\n    * Computes the parentId of a given element.\r\n    * @param element - An html element\r\n    * @returns An object containing the closest parentId , can be empty if nothing was found\r\n    */\r\n    DomContentHandler.prototype._getParentDetails = function (element, elementContent, dataTagPrefix, aiBlobAttributeTag) {\r\n        var parentId = elementContent[\"parentid\"];\r\n        var parentName = elementContent[\"parentname\"];\r\n        var parentInfo = {};\r\n        if (parentId || parentName || !element) {\r\n            return parentInfo;\r\n        }\r\n        return this._populateParentInfo(element, dataTagPrefix, aiBlobAttributeTag);\r\n    };\r\n    /**\r\n    * Check if parent info already set up, if so take and put into content, if not walk up the DOM to find correct info\r\n    * @param element - An html element that the user wants to track\r\n    * @returns An object containing the parent info, can be empty if nothing was found\r\n    */\r\n    DomContentHandler.prototype._populateParentInfo = function (element, dataTagPrefix, aiBlobAttributeTag) {\r\n        var parentInfo = {};\r\n        var parentId;\r\n        // if the user does not set up parent info, walk to the DOM, find the closest parent element (with tags) and populate the info\r\n        var closestParentElement = walkUpDomChainWithElementValidation(element.parentElement, this._isTracked, dataTagPrefix);\r\n        if (closestParentElement) {\r\n            var dataAttr = closestParentElement.getAttribute(aiBlobAttributeTag) || element[aiBlobAttributeTag];\r\n            if (dataAttr) {\r\n                try {\r\n                    var telemetryObject = JSON.parse(dataAttr);\r\n                }\r\n                catch (e) {\r\n                    this._traceLogger.throwInternal(LoggingSeverity.CRITICAL, _ExtendedInternalMessageId.CannotParseAiBlobValue, \"Can not parse \" + dataAttr);\r\n                }\r\n                if (telemetryObject) {\r\n                    parentId = telemetryObject.id;\r\n                }\r\n            }\r\n            else {\r\n                parentId = closestParentElement.getAttribute(dataTagPrefix + \"id\");\r\n            }\r\n        }\r\n        if (parentId) {\r\n            parentInfo[\"parentid\"] = parentId;\r\n        }\r\n        else {\r\n            var htmlContent = this._getHtmlIdAndContentName(element.parentElement);\r\n            parentInfo[\"parentid\"] = htmlContent.id;\r\n            parentInfo[\"parentname\"] = htmlContent.contentName;\r\n        }\r\n        return parentInfo;\r\n    };\r\n    return DomContentHandler;\r\n}());\r\nexport { DomContentHandler };\r\n//# sourceMappingURL=DomContentHandler.js.map"],"names":[],"mappings":";;;;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA"}
+{"version":3,"file":"DomContentHandler.js.map","sources":["DomContentHandler.js"],"sourcesContent":["/**\r\n * @copyright Microsoft 2020\r\n */\r\nimport dynamicProto from \"@microsoft/dynamicproto-js\";\r\nimport { removeInvalidElements, walkUpDomChainWithElementValidation, extend, _ExtendedInternalMessageId, isValueAssigned } from \"../common/Utils\";\r\nimport { LoggingSeverity, getDocument, isNullOrUndefined, hasDocument } from \"@microsoft/applicationinsights-core-js\";\r\nvar MAX_CONTENTNAME_LENGTH = 200;\r\nvar DomContentHandler = /** @class */ (function () {\r\n    /**\r\n     * @param config - ClickAnalytics configuration object\r\n     * @param traceLogger - Trace logger to log to console.\r\n     */\r\n    function DomContentHandler(_config, _traceLogger) {\r\n        this._config = _config;\r\n        this._traceLogger = _traceLogger;\r\n        dynamicProto(DomContentHandler, this, function (_self) {\r\n            _self.getMetadata = function () {\r\n                var dataTags = (_self._config || {}).dataTags;\r\n                var metaTags = {};\r\n                if (hasDocument) {\r\n                    metaTags = isValueAssigned(dataTags.metaDataPrefix) ? _getMetaDataFromDOM(dataTags.captureAllMetaDataContent, dataTags.metaDataPrefix, false) :\r\n                        _getMetaDataFromDOM(dataTags.captureAllMetaDataContent, \"\", false);\r\n                }\r\n                return metaTags;\r\n            };\r\n            _self.getElementContent = function (element) {\r\n                if (!element) {\r\n                    return {};\r\n                }\r\n                var dataTags = (_self._config || {}).dataTags;\r\n                var elementContent = {};\r\n                var biBlobValue;\r\n                var parentDataTagPrefix;\r\n                var dataTagPrefix = dataTags.customDataPrefix;\r\n                var aiBlobAttributeTag = dataTagPrefix + dataTags.aiBlobAttributeTag;\r\n                if (isValueAssigned(dataTags.parentDataTag)) {\r\n                    parentDataTagPrefix = dataTagPrefix + dataTags.parentDataTag;\r\n                }\r\n                if (!_isTracked(element, dataTagPrefix, aiBlobAttributeTag)) {\r\n                    // capture blob from element or hierarchy\r\n                    biBlobValue = element.getAttribute(aiBlobAttributeTag);\r\n                    if (biBlobValue) {\r\n                        try {\r\n                            elementContent = JSON.parse(biBlobValue);\r\n                        }\r\n                        catch (e) {\r\n                            _self._traceLogger.throwInternal(LoggingSeverity.CRITICAL, _ExtendedInternalMessageId.CannotParseAiBlobValue, \"Can not parse \" + biBlobValue);\r\n                        }\r\n                    }\r\n                    else {\r\n                        // traverse up the DOM to find the closest parent with data-* tag defined\r\n                        //contentElement = walkUpDomChainWithElementValidation(element, _self._isTracked, dataTagPrefix);\r\n                        elementContent = extend(elementContent, _populateElementContent(element, dataTagPrefix, parentDataTagPrefix, aiBlobAttributeTag));\r\n                    }\r\n                }\r\n                else {\r\n                    elementContent = extend(elementContent, _populateElementContentwithDataTag(element, dataTagPrefix, parentDataTagPrefix, aiBlobAttributeTag));\r\n                }\r\n                removeInvalidElements(elementContent);\r\n                if (parentDataTagPrefix) {\r\n                    elementContent = extend(elementContent, _getParentDetails(element, elementContent, dataTagPrefix, aiBlobAttributeTag));\r\n                }\r\n                return elementContent;\r\n            };\r\n            /**\r\n             * Capture current level Element content\r\n             */\r\n            function _captureElementContentWithDataTag(contentElement, elementContent, dataTagPrefix) {\r\n                for (var i = 0, attrib; i < contentElement.attributes.length; i++) {\r\n                    attrib = contentElement.attributes[i];\r\n                    if (attrib.name.indexOf(dataTagPrefix) !== 0) {\r\n                        continue;\r\n                    }\r\n                    var attribName = attrib.name.replace(dataTagPrefix, \"\");\r\n                    elementContent[attribName] = attrib.value;\r\n                }\r\n            }\r\n            /**\r\n             * Walk Up the DOM to capture Element content\r\n             */\r\n            function _walkUpDomChainCaptureData(el, elementContent, dataTagPrefix, parentDataTagPrefix, aiBlobAttributeTag) {\r\n                var element = el;\r\n                var parentDataTagFound = false;\r\n                var elementLevelFlag = false; // Use this flag to capture 'id' only at the incoming html element level.\r\n                while (!isNullOrUndefined(element) && !isNullOrUndefined(element.attributes)) {\r\n                    var attributes = element.attributes;\r\n                    for (var i = 0; i < attributes.length; i++) {\r\n                        var attrib = attributes[i];\r\n                        if (attrib.name.indexOf(dataTagPrefix) !== 0) {\r\n                            continue;\r\n                        }\r\n                        if (attrib.name.indexOf(parentDataTagPrefix) === 0) {\r\n                            parentDataTagFound = true;\r\n                        }\r\n                        // Todo handle blob data\r\n                        if (attrib.name.indexOf(aiBlobAttributeTag) === 0) {\r\n                            continue;\r\n                        }\r\n                        var attribName = attrib.name.replace(dataTagPrefix, \"\");\r\n                        if (elementLevelFlag && attribName === \"id\") {\r\n                            continue; // skip capturing id if not at the first level.\r\n                        }\r\n                        if (!isValueAssigned(elementContent[attribName])) {\r\n                            elementContent[attribName] = attrib.value;\r\n                        }\r\n                    }\r\n                    // break after current level;\r\n                    if (parentDataTagFound) {\r\n                        break;\r\n                    }\r\n                    elementLevelFlag = true; // after the initial level set this flag to true.\r\n                    element = element.parentNode;\r\n                }\r\n            }\r\n            /**\r\n             * Capture Element content along with Data Tag attributes and values\r\n             */\r\n            function _populateElementContent(element, dataTagPrefix, parentDataTagPrefix, aiBlobAttributeTag) {\r\n                var elementContent = {};\r\n                if (!element) {\r\n                    return elementContent;\r\n                }\r\n                var htmlContent = _getHtmlIdAndContentName(element);\r\n                elementContent = {\r\n                    id: htmlContent.id || \"\",\r\n                    contentName: htmlContent.contentName || \"\"\r\n                };\r\n                if (isValueAssigned(parentDataTagPrefix)) {\r\n                    _walkUpDomChainCaptureData(element, elementContent, dataTagPrefix, parentDataTagPrefix, aiBlobAttributeTag);\r\n                }\r\n                // Validate to ensure the minimum required field 'id' or 'contentName' is present.\r\n                // The content schema defines id, aN and sN as required fields.  However,\r\n                // requiring these fields would result in majority of adopter's content from being collected.\r\n                // Just throw a warning and continue collection.\r\n                if (!elementContent.id && !elementContent.contentName) {\r\n                    _traceLogger.throwInternal(LoggingSeverity.WARNING, _ExtendedInternalMessageId.InvalidContentBlob, \"Invalid content blob.  Missing required attributes (id, contentName. \" +\r\n                        \" Content information will still be collected!\");\r\n                }\r\n                return elementContent;\r\n            }\r\n            /**\r\n             * Capture Element content along with Data Tag attributes and values\r\n             */\r\n            function _populateElementContentwithDataTag(element, dataTagPrefix, parentDataTagPrefix, aiBlobAttributeTag) {\r\n                var dataTags = (_self._config || {}).dataTags;\r\n                var elementContent = {};\r\n                if (!element) {\r\n                    return elementContent;\r\n                }\r\n                var htmlContent = _getHtmlIdAndContentName(element);\r\n                if (isValueAssigned(parentDataTagPrefix)) {\r\n                    _walkUpDomChainCaptureData(element, elementContent, dataTagPrefix, parentDataTagPrefix, aiBlobAttributeTag);\r\n                }\r\n                else {\r\n                    _captureElementContentWithDataTag(element, elementContent, dataTagPrefix);\r\n                }\r\n                if (dataTags.useDefaultContentNameOrId) {\r\n                    if (!isValueAssigned(elementContent.id)) {\r\n                        elementContent.id = htmlContent.id || \"\";\r\n                    }\r\n                    elementContent.contentName = htmlContent.contentName || \"\";\r\n                }\r\n                // Validate to ensure the minimum required field 'id' or 'contentName' is present.\r\n                // The content schema defines id, aN and sN as required fields.  However,\r\n                // requiring these fields would result in majority of adopter's content from being collected.\r\n                // Just throw a warning and continue collection.\r\n                if (!elementContent.id && !elementContent.contentName) {\r\n                    _traceLogger.throwInternal(LoggingSeverity.WARNING, _ExtendedInternalMessageId.InvalidContentBlob, \"Invalid content blob.  Missing required attributes (id, contentName. \" +\r\n                        \" Content information will still be collected!\");\r\n                }\r\n                return elementContent;\r\n            }\r\n            /**\r\n             * Retrieve a specified metadata tag value from the DOM.\r\n             * @param captureAllMetaDataContent - Flag to capture all metadata content\r\n             * @param prefix - Prefix to search the metatags with.\r\n             * @param removePrefix - Specifies if the prefix must be excluded from key names in the returned collection.\r\n             * @returns Metadata collection/property bag\r\n             */\r\n            function _getMetaDataFromDOM(captureAllMetaDataContent, prefix, removePrefix) {\r\n                var metaElements;\r\n                var metaData = {};\r\n                if (hasDocument) {\r\n                    metaElements = document.querySelectorAll(\"meta\");\r\n                    for (var i = 0; i < metaElements.length; i++) {\r\n                        var meta = metaElements[i];\r\n                        if (meta.name) {\r\n                            if (captureAllMetaDataContent || meta.name.indexOf(prefix) === 0) {\r\n                                var name_1 = removePrefix ? meta.name.replace(prefix, \"\") : meta.name;\r\n                                metaData[name_1] = meta.content;\r\n                            }\r\n                        }\r\n                    }\r\n                }\r\n                return metaData;\r\n            }\r\n            /**\r\n             * Gets the default content name.\r\n             * @param element - An html element\r\n             * @param useDefaultContentNameOrId -Flag indicating if an element is market PII.\r\n             * @returns Content name\r\n             */\r\n            function _getDefaultContentName(element, useDefaultContentName) {\r\n                if (useDefaultContentName === false || !element.tagName) {\r\n                    return \"\";\r\n                }\r\n                var doc = getDocument() || {};\r\n                var contentName;\r\n                switch (element.tagName) {\r\n                    case \"A\":\r\n                        contentName = doc.all ? element.innerText || element.innerHTML : element.text || element.innerHTML;\r\n                        break;\r\n                    case \"IMG\":\r\n                    case \"AREA\":\r\n                        contentName = element.alt;\r\n                        break;\r\n                    default:\r\n                        contentName = element.value || element.name || element.alt || element.innerText || element.id;\r\n                }\r\n                return contentName.substring(0, MAX_CONTENTNAME_LENGTH);\r\n            }\r\n            /**\r\n             * Check if the user wants to track the element, which means if the element has any tags with data-* or customDataPrefix\r\n             * @param element - An html element\r\n             * @returns true if any data-* exist, otherwise return false\r\n             */\r\n            function _isTracked(element, dataTag, aiBlobAttributeTag) {\r\n                var attrs = element.attributes;\r\n                var dataTagFound = false;\r\n                for (var i = 0; i < attrs.length; i++) {\r\n                    var attributeName = attrs[i].name;\r\n                    if (attributeName === aiBlobAttributeTag) {\r\n                        // ignore if the attribute name is equal to aiBlobAttributeTag\r\n                        return false;\r\n                    }\r\n                    else if (attributeName.indexOf(dataTag) === 0) {\r\n                        dataTagFound = true;\r\n                    }\r\n                }\r\n                return dataTagFound;\r\n            }\r\n            function _getHtmlIdAndContentName(element) {\r\n                var dataTags = (_self._config || {}).dataTags;\r\n                var callback = (_self._config || {}).callback;\r\n                var htmlContent = {};\r\n                if (!element) {\r\n                    return htmlContent;\r\n                }\r\n                if (dataTags.useDefaultContentNameOrId) {\r\n                    var customizedContentName = callback.contentName ? callback.contentName(element, dataTags.useDefaultContentNameOrId) : \"\";\r\n                    var defaultContentName = _getDefaultContentName(element, dataTags.useDefaultContentNameOrId);\r\n                    htmlContent = {\r\n                        id: element.id,\r\n                        contentName: customizedContentName || defaultContentName || element.getAttribute(\"alt\")\r\n                    };\r\n                }\r\n                return htmlContent;\r\n            }\r\n            /**\r\n            * Computes the parentId of a given element.\r\n            * @param element - An html element\r\n            * @returns An object containing the closest parentId , can be empty if nothing was found\r\n            */\r\n            function _getParentDetails(element, elementContent, dataTagPrefix, aiBlobAttributeTag) {\r\n                var parentId = elementContent[\"parentid\"];\r\n                var parentName = elementContent[\"parentname\"];\r\n                var parentInfo = {};\r\n                if (parentId || parentName || !element) {\r\n                    return parentInfo;\r\n                }\r\n                return _populateParentInfo(element, dataTagPrefix, aiBlobAttributeTag);\r\n            }\r\n            /**\r\n            * Check if parent info already set up, if so take and put into content, if not walk up the DOM to find correct info\r\n            * @param element - An html element that the user wants to track\r\n            * @returns An object containing the parent info, can be empty if nothing was found\r\n            */\r\n            function _populateParentInfo(element, dataTagPrefix, aiBlobAttributeTag) {\r\n                var parentInfo = {};\r\n                var parentId;\r\n                // if the user does not set up parent info, walk to the DOM, find the closest parent element (with tags) and populate the info\r\n                var closestParentElement = walkUpDomChainWithElementValidation(element.parentElement, _isTracked, dataTagPrefix);\r\n                if (closestParentElement) {\r\n                    var dataAttr = closestParentElement.getAttribute(aiBlobAttributeTag) || element[aiBlobAttributeTag];\r\n                    if (dataAttr) {\r\n                        try {\r\n                            var telemetryObject = JSON.parse(dataAttr);\r\n                        }\r\n                        catch (e) {\r\n                            _traceLogger.throwInternal(LoggingSeverity.CRITICAL, _ExtendedInternalMessageId.CannotParseAiBlobValue, \"Can not parse \" + dataAttr);\r\n                        }\r\n                        if (telemetryObject) {\r\n                            parentId = telemetryObject.id;\r\n                        }\r\n                    }\r\n                    else {\r\n                        parentId = closestParentElement.getAttribute(dataTagPrefix + \"id\");\r\n                    }\r\n                }\r\n                if (parentId) {\r\n                    parentInfo[\"parentid\"] = parentId;\r\n                }\r\n                else {\r\n                    var htmlContent = _getHtmlIdAndContentName(element.parentElement);\r\n                    parentInfo[\"parentid\"] = htmlContent.id;\r\n                    parentInfo[\"parentname\"] = htmlContent.contentName;\r\n                }\r\n                return parentInfo;\r\n            }\r\n        });\r\n    }\r\n    /**\r\n     * Collect metatags from DOM.\r\n     * Collect data from meta tags.\r\n     * @returns {object} - Metatags collection/property bag\r\n     */\r\n    DomContentHandler.prototype.getMetadata = function () {\r\n        // @DynamicProtoStub -- DO NOT add any code as this will be removed during packaging\r\n        return null;\r\n    };\r\n    /**\r\n     * Collect data-* attributes for the given element.\r\n     * All attributes with data-* prefix or user provided customDataPrefix are collected.'data-*' prefix is removed from the key name.\r\n     * @param element - The element from which attributes need to be collected.\r\n     * @returns String representation of the Json array of element attributes\r\n     */\r\n    DomContentHandler.prototype.getElementContent = function (element) {\r\n        // @DynamicProtoStub -- DO NOT add any code as this will be removed during packaging\r\n        return null;\r\n    };\r\n    return DomContentHandler;\r\n}());\r\nexport { DomContentHandler };\r\n//# sourceMappingURL=DomContentHandler.js.map"],"names":[],"mappings":";;;;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;kEAkBM;AACN;AACA;AACA;AACA"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@microsoft/applicationinsights-clickanalytics-js",
-    "version": "2.8.0-beta.2203-08",
+    "version": "2.8.0-beta.2203-11",
     "description": "Microsoft Application Insights Click Analytics extension",
     "homepage": "https://github.com/microsoft/ApplicationInsights-JS#readme",
     "author": "Microsoft Application Insights Team",
@@ -30,7 +30,7 @@
         "@rollup/plugin-commonjs": "^18.0.0",
         "@rollup/plugin-node-resolve": "^11.2.1",
         "@rollup/plugin-replace": "^2.3.3",
-        "rollup-plugin-cleanup": "3.2.1",
+        "rollup-plugin-cleanup": "^3.2.1",
         "rollup": "^2.32.0",
         "grunt": "^1.4.1",
         "grunt-cli": "^1.4.3",
@@ -44,9 +44,9 @@
     "dependencies": {
         "@microsoft/dynamicproto-js": "^1.1.4",
         "@microsoft/applicationinsights-shims": "2.0.1",
-        "@microsoft/applicationinsights-core-js": "2.8.0-beta.2203-08",
-        "@microsoft/applicationinsights-common": "2.8.0-beta.2203-08",
-        "@microsoft/applicationinsights-properties-js": "2.8.0-beta.2203-08"
+        "@microsoft/applicationinsights-core-js": "2.8.0-beta.2203-11",
+        "@microsoft/applicationinsights-common": "2.8.0-beta.2203-11",
+        "@microsoft/applicationinsights-properties-js": "2.8.0-beta.2203-11"
     },
     "repository": {
         "type": "git",

package/src/ClickAnalyticsPlugin.ts

@@ -2,12 +2,13 @@
  * @copyright Microsoft 2020
  */
 
+import dynamicProto from "@microsoft/dynamicproto-js";
 import {
     IPlugin, IConfiguration, IAppInsightsCore,
     BaseTelemetryPlugin, isNullOrUndefined, ITelemetryItem,
     IProcessTelemetryContext, ITelemetryPluginChain,
     _InternalMessageId, ICustomProperties,
-    LoggingSeverity, arrForEach, dumpObj, getExceptionName
+    LoggingSeverity, arrForEach, dumpObj, getExceptionName, throwError, _throwInternal, IProcessTelemetryUnloadContext, ITelemetryUnloadState, unloadComponents
 } from "@microsoft/applicationinsights-core-js";
 import { IConfig, IPropertiesPlugin, PropertiesPluginIdentifier } from "@microsoft/applicationinsights-common";
 import {
@@ -17,7 +18,7 @@ import {
 import {
     mergeConfig, BehaviorMapValidator,
     BehaviorValueValidator, BehaviorEnumValidator, _ExtendedInternalMessageId
-    } from "./common/Utils";
+} from "./common/Utils";
 import { PageAction } from "./events/PageAction";
 import { AutoCaptureHandler } from "./handlers/AutoCaptureHandler";
 import { DomContentHandler } from "./handlers/DomContentHandler";
@@ -27,46 +28,100 @@ export { BehaviorMapValidator, BehaviorValueValidator, BehaviorEnumValidator }
 export class ClickAnalyticsPlugin extends BaseTelemetryPlugin {
     public identifier: string = "ClickAnalyticsPlugin";
     public priority: number = 181;
-    public static Version = "2.8.0-beta.2203-08";
-    private _config: IClickAnalyticsConfiguration;
-    private pageAction: PageAction;
-    private _autoCaptureHandler: IAutoCaptureHandler;
-    private _contentHandler: IContentHandler;
+    public static Version = "2.8.0-beta.2203-11";
 
-    initialize(config: IConfiguration & IConfig, core: IAppInsightsCore, extensions: IPlugin[], pluginChain?: ITelemetryPluginChain) {
-        
-        if (isNullOrUndefined(core)) {
-            throw Error("Error initializing");
-        }
-        config.extensionConfig = config.extensionConfig || [];
-        config.extensionConfig[this.identifier] = config.extensionConfig[this.identifier] || {};
-        this._config = mergeConfig(config.extensionConfig[this.identifier]);
-        super.initialize(config, core, extensions, pluginChain);
-        // Default to DOM content handler
-        this._contentHandler = this._contentHandler ? this._contentHandler : new DomContentHandler(this._config, this.diagLog());
-        let metaTags = this._contentHandler.getMetadata();
-        this.pageAction = new PageAction(this, this._config, this._contentHandler, this._config.callback.pageActionPageTags, metaTags, this.diagLog());
-        // Default to DOM autoCapture handler
-        this._autoCaptureHandler = this._autoCaptureHandler ? this._autoCaptureHandler : new AutoCaptureHandler(this, this._config, this.pageAction, this.diagLog());
-        if (this._config.autoCapture) {
-            this._autoCaptureHandler.click();
-        }
-        // Find the properties plugin.
-        let _propertiesExtension:IPropertiesPlugin;
-        arrForEach(extensions, extension => {
-            if (extension.identifier === PropertiesPluginIdentifier) {
-                _propertiesExtension = extension as PropertiesPlugin;
+    constructor() {
+        super();
+
+        let _config: IClickAnalyticsConfiguration;
+        let _pageAction: PageAction;
+        let _autoCaptureHandler: IAutoCaptureHandler;
+        let _contentHandler: IContentHandler;
+
+        dynamicProto(ClickAnalyticsPlugin, this, (_self, _base) => {
+            let _identifier = _self.identifier;
+            _initDefaults();
+
+            _self.initialize = (config: IConfiguration & IConfig, core: IAppInsightsCore, extensions: IPlugin[], pluginChain?: ITelemetryPluginChain) => {
+
+                if (isNullOrUndefined(core)) {
+                    throwError("Error initializing");
+                }
+
+                config.extensionConfig = config.extensionConfig || [];
+                config.extensionConfig[_identifier] = config.extensionConfig[_identifier] || {};
+                _config = mergeConfig(config.extensionConfig[_identifier]);
+                super.initialize(config, core, extensions, pluginChain);
+                let logger = _self.diagLog();
+
+                // Default to DOM content handler
+                _contentHandler = _contentHandler ? _contentHandler : new DomContentHandler(_config, logger);
+                let metaTags = _contentHandler.getMetadata();
+                _pageAction = new PageAction(this, _config, _contentHandler, _config.callback.pageActionPageTags, metaTags, logger);
+
+                // Default to DOM autoCapture handler
+                _autoCaptureHandler = _autoCaptureHandler ? _autoCaptureHandler : new AutoCaptureHandler(_self, _config, _pageAction, logger);
+                if (_config.autoCapture) {
+                    _autoCaptureHandler.click();
+                }
+
+                // Find the properties plugin.
+                let _propertiesExtension:IPropertiesPlugin;
+                arrForEach(extensions, extension => {
+                    if (extension.identifier === PropertiesPluginIdentifier) {
+                        _propertiesExtension = extension as PropertiesPlugin;
+                    }
+                });
+                // Append Click Analytics Plugin Version to SDK version.
+                if (_propertiesExtension && _propertiesExtension.context &&
+                    _propertiesExtension.context.internal && _propertiesExtension.context.internal.sdkVersion) {
+                    _propertiesExtension.context.internal.sdkVersion += "_ClickPlugin"+ ClickAnalyticsPlugin.Version;
+                }
             }
+        
+            _self.processTelemetry = (env: ITelemetryItem, itemCtx?: IProcessTelemetryContext): void => {
+                _self.processNext(env, itemCtx);
+            };
+        
+            _self.trackPageAction = (pageAction?: IPageActionTelemetry, customProperties?: ICustomProperties) => {
+                try {
+                    _pageAction.trackPageAction(pageAction, customProperties);
+                } catch (e) {
+                    _throwInternal(
+                        _self.diagLog(),
+                        LoggingSeverity.CRITICAL,
+                        _ExtendedInternalMessageId.TrackPageActionEventFailed,
+                        "trackPageAction failed, page action event will not be collected: " + getExceptionName(e),
+                        { exception: dumpObj(e) });
+                }
+            };
+
+            _self._doTeardown = (unloadCtx?: IProcessTelemetryUnloadContext, unloadState?: ITelemetryUnloadState, asyncCallback?: () => void): void | boolean => {
+                return unloadComponents([
+                    _autoCaptureHandler,
+                    _contentHandler,
+                    _pageAction
+                ], unloadCtx, unloadState, () => {
+                    _initDefaults();
+                    asyncCallback && asyncCallback();
+                })
+            };
         });
-        // Append Click Analytics Plugin Version to SDK version.
-        if (_propertiesExtension && _propertiesExtension.context &&
-            _propertiesExtension.context.internal && _propertiesExtension.context.internal.sdkVersion) {
-                _propertiesExtension.context.internal.sdkVersion += "_ClickPlugin"+ ClickAnalyticsPlugin.Version;
+
+        function _initDefaults() {
+            _config = null;
+            _pageAction = null;
+            _autoCaptureHandler = null;
+            _contentHandler = null;
         }
     }
 
-    processTelemetry(env: ITelemetryItem, itemCtx?: IProcessTelemetryContext): void {
-        this.processNext(env, itemCtx);
+    public initialize(config: IConfiguration & IConfig, core: IAppInsightsCore, extensions: IPlugin[], pluginChain?: ITelemetryPluginChain) {
+        // @DynamicProtoStub -- DO NOT add any code as this will be removed during packaging
+    }
+
+    public processTelemetry(env: ITelemetryItem, itemCtx?: IProcessTelemetryContext): void {
+        // @DynamicProtoStub -- DO NOT add any code as this will be removed during packaging
     }
 
     /**
@@ -75,16 +130,6 @@ export class ClickAnalyticsPlugin extends BaseTelemetryPlugin {
      * @param customProperties Additional data used to filter events and metrics. Defaults to empty.
      */
     public trackPageAction(pageAction?: IPageActionTelemetry, customProperties?: ICustomProperties) {
-        try {
-
-            this.pageAction.trackPageAction(pageAction,customProperties);
-
-        } catch (e) {
-            this.diagLog().throwInternal(
-                LoggingSeverity.CRITICAL,
-                _ExtendedInternalMessageId.TrackPageActionEventFailed,
-                "trackPageAction failed, page action event will not be collected: " + getExceptionName(e),
-                { exception: dumpObj(e) });
-        }
+        // @DynamicProtoStub -- DO NOT add any code as this will be removed during packaging
     }
 }

package/src/DataCollector.ts

@@ -41,26 +41,26 @@ export function getImageHref(element: HTMLImageElement): string {
 export function getClickTarget(element: any) {
     var clickTarget = "";
     switch (element.tagName) {
-        case "A":
-        case "AREA":
-            clickTarget = element.href || "";
-            break;
-        case "IMG":
-            clickTarget = getImageHref(element as HTMLImageElement);
-            break;
-        case "INPUT":
-            var type = element.type;
-            if (type && (clickCaptureInputTypes[type.toUpperCase()])) {
-                let loc = getLocation() || ({} as Location);
-                if (element.form) {
-                    clickTarget = element.form.action || (loc.pathname || "");
-                } else {
-                    clickTarget = loc.pathname || "";
-                }
+    case "A":
+    case "AREA":
+        clickTarget = element.href || "";
+        break;
+    case "IMG":
+        clickTarget = getImageHref(element as HTMLImageElement);
+        break;
+    case "INPUT":
+        var type = element.type;
+        if (type && (clickCaptureInputTypes[type.toUpperCase()])) {
+            let loc = getLocation() || ({} as Location);
+            if (element.form) {
+                clickTarget = element.form.action || (loc.pathname || "");
+            } else {
+                clickTarget = loc.pathname || "";
             }
-            break;
-        default:
-            break;
+        }
+        break;
+    default:
+        break;
     }
     return clickTarget;
 }
@@ -95,7 +95,9 @@ function onDomReadyDo(f: any) {
     /// <param type='function'>function to call on domRead</param>
 
     let doc = getDocument() || ({} as Document);
-    /in/.test(doc.readyState) ? setTimeout(() => { onDomReadyDo(f); }, 100) : f.call();
+    /in/.test(doc.readyState) ? setTimeout(() => {
+        onDomReadyDo(f);
+    }, 100) : f.call();
 }
 
 /**
@@ -115,8 +117,8 @@ export function getPageName(config: IClickAnalyticsConfiguration, overrideValues
     } else if (config.coreData && config.coreData.pageName) {
         return config.coreData.pageName;
     } else {
-       const doc = getDocument();
-       return doc && doc.title || "";
+        const doc = getDocument();
+        return doc && doc.title || "";
     }
 }
 

package/src/Interfaces/Datamodel.ts

@@ -3,7 +3,7 @@
  */
 
 import { IEventTelemetry } from "@microsoft/applicationinsights-common";
-
+import { IUnloadableComponent } from "@microsoft/applicationinsights-core-js";
 
 /**
  * ClickAnalytics Configuration
@@ -126,27 +126,27 @@ export interface IValueCallback {
  * PageTags format
  */
 export interface IPageTags {
-   /**
-    * Meta data tags
-    */
+    /**
+     * Meta data tags
+     */
     metaTags?: { [name: string]: string };
-   /**
-    * Any other page tag
-    */
+    /**
+     * Any other page tag
+     */
     [name: string]: string | number | boolean | string[] | number[] | boolean[] | object | undefined;
 }
 
 /**
  * Auto capture handler interface
  */
-export interface IAutoCaptureHandler {
+export interface IAutoCaptureHandler extends IUnloadableComponent {
     /**
      * Auto capture click
      */
     click: () => void;
-  }
+}
 
-  export interface IPageActionOverrideValues extends IOverrideValues {
+export interface IPageActionOverrideValues extends IOverrideValues {
     /**
      * Uri of the referrer page
      */
@@ -175,11 +175,11 @@ export interface IAutoCaptureHandler {
      * KVPs to be added to the content tags collected on a Page Action event; extends the items in the Content blob in Page Action events
      */
     contentTags?: any;
-  }
+}
 
-  /**
-   * Override values interface
-   */
+/**
+ * Override values interface
+ */
 export interface IOverrideValues {
     /**
      * One of the awa.behavior values.
@@ -201,7 +201,7 @@ export interface IOverrideValues {
      * Indicates if the event was fired automatically
      */
     isAuto?: boolean;
-  }
+}
 
 /**
  * Content interface
@@ -223,10 +223,10 @@ export interface IContent {
     [name: string]: string | number | boolean | string[] | number[] | boolean[] | object | undefined;
 }
 
- /**
-  * Content handler interface
-  */
-export interface IContentHandler {
+/**
+ * Content handler interface
+ */
+export interface IContentHandler extends IUnloadableComponent {
     /**
      * Get meta data
      */
@@ -235,8 +235,7 @@ export interface IContentHandler {
      * Get element content
      */
     getElementContent: (element: Element) => IContent;
-    
-  }
+}
 
 /**
  * Page Action event

package/src/common/Utils.ts

@@ -342,18 +342,18 @@ export function mergeConfig(overrideConfig: IClickAnalyticsConfiguration): IClic
     };
 
     let attributesThatAreObjectsInConfig: any[] = [];
-        for (const attribute in defaultConfig) {
-            if (typeof defaultConfig[attribute] === "object") {
-                attributesThatAreObjectsInConfig.push(attribute);
-            }
+    for (const attribute in defaultConfig) {
+        if (typeof defaultConfig[attribute] === "object") {
+            attributesThatAreObjectsInConfig.push(attribute);
         }
+    }
 
     if (overrideConfig) {
-            // delete attributes that should be object and
-            // delete properties that are null, undefined, ''
-         removeNonObjectsAndInvalidElements(overrideConfig, attributesThatAreObjectsInConfig);
+        // delete attributes that should be object and
+        // delete properties that are null, undefined, ''
+        removeNonObjectsAndInvalidElements(overrideConfig, attributesThatAreObjectsInConfig);
         if(isValueAssigned(overrideConfig.dataTags)) {
-                overrideConfig.dataTags.customDataPrefix = validateContentNamePrefix(overrideConfig, DEFAULT_DATA_PREFIX) ? overrideConfig.dataTags.customDataPrefix : DEFAULT_DATA_PREFIX;
+            overrideConfig.dataTags.customDataPrefix = validateContentNamePrefix(overrideConfig, DEFAULT_DATA_PREFIX) ? overrideConfig.dataTags.customDataPrefix : DEFAULT_DATA_PREFIX;
         }
         return extend(true, defaultConfig, overrideConfig);
     }