parse5 3.0.3 → 5.1.0

package/lib/utils/mixin.js

@@ -1,18 +1,39 @@
 'use strict';
 
-var Mixin = module.exports = function (host) {
-    var originalMethods = {},
-        overriddenMethods = this._getOverriddenMethods(this, originalMethods);
-
-    Object.keys(overriddenMethods).forEach(function (key) {
-        if (typeof overriddenMethods[key] === 'function') {
-            originalMethods[key] = host[key];
-            host[key] = overriddenMethods[key];
+class Mixin {
+    constructor(host) {
+        const originalMethods = {};
+        const overriddenMethods = this._getOverriddenMethods(this, originalMethods);
+
+        for (const key of Object.keys(overriddenMethods)) {
+            if (typeof overriddenMethods[key] === 'function') {
+                originalMethods[key] = host[key];
+                host[key] = overriddenMethods[key];
+            }
         }
-    });
-};
+    }
+
+    _getOverriddenMethods() {
+        throw new Error('Not implemented');
+    }
+}
+
+Mixin.install = function(host, Ctor, opts) {
+    if (!host.__mixins) {
+        host.__mixins = [];
+    }
+
+    for (let i = 0; i < host.__mixins.length; i++) {
+        if (host.__mixins[i].constructor === Ctor) {
+            return host.__mixins[i];
+        }
+    }
+
+    const mixin = new Ctor(host, opts);
+
+    host.__mixins.push(mixin);
 
-Mixin.prototype._getOverriddenMethods = function () {
-    throw new Error('Not implemented');
+    return mixin;
 };
 
+module.exports = Mixin;

package/package.json

@@ -1,63 +1,34 @@
 {
-  "name": "parse5",
-  "description": "HTML parsing/serialization toolset for Node.js. WHATWG HTML Living Standard (aka HTML5)-compliant.",
-  "version": "3.0.3",
-  "author": "Ivan Nikulin <ifaaan@gmail.com> (https://github.com/inikulin)",
-  "contributors": "https://github.com/inikulin/parse5/graphs/contributors",
-  "homepage": "https://github.com/inikulin/parse5",
-  "devDependencies": {
-    "del": "^2.0.2",
-    "gulp": "^3.9.0",
-    "gulp-benchmark": "^1.1.1",
-    "gulp-download": "0.0.1",
-    "gulp-eslint": "^3.0.1",
-    "gulp-install": "^0.6.0",
-    "gulp-mocha": "^2.1.3",
-    "gulp-rename": "^1.2.2",
-    "gulp-typedoc": "^2.0.0",
-    "gulp-typescript": "^3.1.2",
-    "publish-please": "^2.2.0",
-    "through2": "^2.0.0",
-    "typedoc": "^0.5.1",
-    "typescript": "^2.0.6"
-  },
-  "keywords": [
-    "html",
-    "parser",
-    "html5",
-    "WHATWG",
-    "specification",
-    "fast",
-    "html parser",
-    "html5 parser",
-    "htmlparser",
-    "parse5",
-    "serializer",
-    "html serializer",
-    "htmlserializer",
-    "sax",
-    "simple api",
-    "parse",
-    "tokenize",
-    "serialize",
-    "tokenizer"
-  ],
-  "license": "MIT",
-  "main": "./lib/index.js",
-  "types": "./lib/index.d.ts",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/inikulin/parse5.git"
-  },
-  "scripts": {
-    "test": "gulp test",
-    "publish-please": "publish-please",
-    "prepublish": "publish-please guard"
-  },
-  "files": [
-    "lib"
-  ],
-  "dependencies": {
-    "@types/node": "*"
-  }
+    "name": "parse5",
+    "description": "HTML parser and serializer.",
+    "version": "5.1.0",
+    "author": "Ivan Nikulin <ifaaan@gmail.com> (https://github.com/inikulin)",
+    "contributors": "https://github.com/inikulin/parse5/graphs/contributors",
+    "homepage": "https://github.com/inikulin/parse5",
+    "keywords": [
+        "html",
+        "parser",
+        "html5",
+        "WHATWG",
+        "specification",
+        "fast",
+        "html parser",
+        "html5 parser",
+        "htmlparser",
+        "parse5",
+        "serializer",
+        "html serializer",
+        "htmlserializer",
+        "parse",
+        "serialize"
+    ],
+    "license": "MIT",
+    "main": "./lib/index.js",
+    "repository": {
+        "type": "git",
+        "url": "git://github.com/inikulin/parse5.git"
+    },
+    "files": [
+        "lib"
+    ]
 }

package/LICENSE

@@ -1,19 +0,0 @@
-Copyright (c) 2013-2016 Ivan Nikulin (ifaaan@gmail.com, https://github.com/inikulin)
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.

package/lib/common/foreign_content.js

@@ -1,260 +0,0 @@
-'use strict';
-
-var Tokenizer = require('../tokenizer'),
-    HTML = require('./html');
-
-//Aliases
-var $ = HTML.TAG_NAMES,
-    NS = HTML.NAMESPACES,
-    ATTRS = HTML.ATTRS;
-
-
-//MIME types
-var MIME_TYPES = {
-    TEXT_HTML: 'text/html',
-    APPLICATION_XML: 'application/xhtml+xml'
-};
-
-//Attributes
-var DEFINITION_URL_ATTR = 'definitionurl',
-    ADJUSTED_DEFINITION_URL_ATTR = 'definitionURL',
-    SVG_ATTRS_ADJUSTMENT_MAP = {
-        'attributename': 'attributeName',
-        'attributetype': 'attributeType',
-        'basefrequency': 'baseFrequency',
-        'baseprofile': 'baseProfile',
-        'calcmode': 'calcMode',
-        'clippathunits': 'clipPathUnits',
-        'diffuseconstant': 'diffuseConstant',
-        'edgemode': 'edgeMode',
-        'filterunits': 'filterUnits',
-        'glyphref': 'glyphRef',
-        'gradienttransform': 'gradientTransform',
-        'gradientunits': 'gradientUnits',
-        'kernelmatrix': 'kernelMatrix',
-        'kernelunitlength': 'kernelUnitLength',
-        'keypoints': 'keyPoints',
-        'keysplines': 'keySplines',
-        'keytimes': 'keyTimes',
-        'lengthadjust': 'lengthAdjust',
-        'limitingconeangle': 'limitingConeAngle',
-        'markerheight': 'markerHeight',
-        'markerunits': 'markerUnits',
-        'markerwidth': 'markerWidth',
-        'maskcontentunits': 'maskContentUnits',
-        'maskunits': 'maskUnits',
-        'numoctaves': 'numOctaves',
-        'pathlength': 'pathLength',
-        'patterncontentunits': 'patternContentUnits',
-        'patterntransform': 'patternTransform',
-        'patternunits': 'patternUnits',
-        'pointsatx': 'pointsAtX',
-        'pointsaty': 'pointsAtY',
-        'pointsatz': 'pointsAtZ',
-        'preservealpha': 'preserveAlpha',
-        'preserveaspectratio': 'preserveAspectRatio',
-        'primitiveunits': 'primitiveUnits',
-        'refx': 'refX',
-        'refy': 'refY',
-        'repeatcount': 'repeatCount',
-        'repeatdur': 'repeatDur',
-        'requiredextensions': 'requiredExtensions',
-        'requiredfeatures': 'requiredFeatures',
-        'specularconstant': 'specularConstant',
-        'specularexponent': 'specularExponent',
-        'spreadmethod': 'spreadMethod',
-        'startoffset': 'startOffset',
-        'stddeviation': 'stdDeviation',
-        'stitchtiles': 'stitchTiles',
-        'surfacescale': 'surfaceScale',
-        'systemlanguage': 'systemLanguage',
-        'tablevalues': 'tableValues',
-        'targetx': 'targetX',
-        'targety': 'targetY',
-        'textlength': 'textLength',
-        'viewbox': 'viewBox',
-        'viewtarget': 'viewTarget',
-        'xchannelselector': 'xChannelSelector',
-        'ychannelselector': 'yChannelSelector',
-        'zoomandpan': 'zoomAndPan'
-    },
-    XML_ATTRS_ADJUSTMENT_MAP = {
-        'xlink:actuate': {prefix: 'xlink', name: 'actuate', namespace: NS.XLINK},
-        'xlink:arcrole': {prefix: 'xlink', name: 'arcrole', namespace: NS.XLINK},
-        'xlink:href': {prefix: 'xlink', name: 'href', namespace: NS.XLINK},
-        'xlink:role': {prefix: 'xlink', name: 'role', namespace: NS.XLINK},
-        'xlink:show': {prefix: 'xlink', name: 'show', namespace: NS.XLINK},
-        'xlink:title': {prefix: 'xlink', name: 'title', namespace: NS.XLINK},
-        'xlink:type': {prefix: 'xlink', name: 'type', namespace: NS.XLINK},
-        'xml:base': {prefix: 'xml', name: 'base', namespace: NS.XML},
-        'xml:lang': {prefix: 'xml', name: 'lang', namespace: NS.XML},
-        'xml:space': {prefix: 'xml', name: 'space', namespace: NS.XML},
-        'xmlns': {prefix: '', name: 'xmlns', namespace: NS.XMLNS},
-        'xmlns:xlink': {prefix: 'xmlns', name: 'xlink', namespace: NS.XMLNS}
-
-    };
-
-//SVG tag names adjustment map
-var SVG_TAG_NAMES_ADJUSTMENT_MAP = exports.SVG_TAG_NAMES_ADJUSTMENT_MAP = {
-    'altglyph': 'altGlyph',
-    'altglyphdef': 'altGlyphDef',
-    'altglyphitem': 'altGlyphItem',
-    'animatecolor': 'animateColor',
-    'animatemotion': 'animateMotion',
-    'animatetransform': 'animateTransform',
-    'clippath': 'clipPath',
-    'feblend': 'feBlend',
-    'fecolormatrix': 'feColorMatrix',
-    'fecomponenttransfer': 'feComponentTransfer',
-    'fecomposite': 'feComposite',
-    'feconvolvematrix': 'feConvolveMatrix',
-    'fediffuselighting': 'feDiffuseLighting',
-    'fedisplacementmap': 'feDisplacementMap',
-    'fedistantlight': 'feDistantLight',
-    'feflood': 'feFlood',
-    'fefunca': 'feFuncA',
-    'fefuncb': 'feFuncB',
-    'fefuncg': 'feFuncG',
-    'fefuncr': 'feFuncR',
-    'fegaussianblur': 'feGaussianBlur',
-    'feimage': 'feImage',
-    'femerge': 'feMerge',
-    'femergenode': 'feMergeNode',
-    'femorphology': 'feMorphology',
-    'feoffset': 'feOffset',
-    'fepointlight': 'fePointLight',
-    'fespecularlighting': 'feSpecularLighting',
-    'fespotlight': 'feSpotLight',
-    'fetile': 'feTile',
-    'feturbulence': 'feTurbulence',
-    'foreignobject': 'foreignObject',
-    'glyphref': 'glyphRef',
-    'lineargradient': 'linearGradient',
-    'radialgradient': 'radialGradient',
-    'textpath': 'textPath'
-};
-
-//Tags that causes exit from foreign content
-var EXITS_FOREIGN_CONTENT = Object.create(null);
-
-EXITS_FOREIGN_CONTENT[$.B] = true;
-EXITS_FOREIGN_CONTENT[$.BIG] = true;
-EXITS_FOREIGN_CONTENT[$.BLOCKQUOTE] = true;
-EXITS_FOREIGN_CONTENT[$.BODY] = true;
-EXITS_FOREIGN_CONTENT[$.BR] = true;
-EXITS_FOREIGN_CONTENT[$.CENTER] = true;
-EXITS_FOREIGN_CONTENT[$.CODE] = true;
-EXITS_FOREIGN_CONTENT[$.DD] = true;
-EXITS_FOREIGN_CONTENT[$.DIV] = true;
-EXITS_FOREIGN_CONTENT[$.DL] = true;
-EXITS_FOREIGN_CONTENT[$.DT] = true;
-EXITS_FOREIGN_CONTENT[$.EM] = true;
-EXITS_FOREIGN_CONTENT[$.EMBED] = true;
-EXITS_FOREIGN_CONTENT[$.H1] = true;
-EXITS_FOREIGN_CONTENT[$.H2] = true;
-EXITS_FOREIGN_CONTENT[$.H3] = true;
-EXITS_FOREIGN_CONTENT[$.H4] = true;
-EXITS_FOREIGN_CONTENT[$.H5] = true;
-EXITS_FOREIGN_CONTENT[$.H6] = true;
-EXITS_FOREIGN_CONTENT[$.HEAD] = true;
-EXITS_FOREIGN_CONTENT[$.HR] = true;
-EXITS_FOREIGN_CONTENT[$.I] = true;
-EXITS_FOREIGN_CONTENT[$.IMG] = true;
-EXITS_FOREIGN_CONTENT[$.LI] = true;
-EXITS_FOREIGN_CONTENT[$.LISTING] = true;
-EXITS_FOREIGN_CONTENT[$.MENU] = true;
-EXITS_FOREIGN_CONTENT[$.META] = true;
-EXITS_FOREIGN_CONTENT[$.NOBR] = true;
-EXITS_FOREIGN_CONTENT[$.OL] = true;
-EXITS_FOREIGN_CONTENT[$.P] = true;
-EXITS_FOREIGN_CONTENT[$.PRE] = true;
-EXITS_FOREIGN_CONTENT[$.RUBY] = true;
-EXITS_FOREIGN_CONTENT[$.S] = true;
-EXITS_FOREIGN_CONTENT[$.SMALL] = true;
-EXITS_FOREIGN_CONTENT[$.SPAN] = true;
-EXITS_FOREIGN_CONTENT[$.STRONG] = true;
-EXITS_FOREIGN_CONTENT[$.STRIKE] = true;
-EXITS_FOREIGN_CONTENT[$.SUB] = true;
-EXITS_FOREIGN_CONTENT[$.SUP] = true;
-EXITS_FOREIGN_CONTENT[$.TABLE] = true;
-EXITS_FOREIGN_CONTENT[$.TT] = true;
-EXITS_FOREIGN_CONTENT[$.U] = true;
-EXITS_FOREIGN_CONTENT[$.UL] = true;
-EXITS_FOREIGN_CONTENT[$.VAR] = true;
-
-//Check exit from foreign content
-exports.causesExit = function (startTagToken) {
-    var tn = startTagToken.tagName;
-    var isFontWithAttrs = tn === $.FONT && (Tokenizer.getTokenAttr(startTagToken, ATTRS.COLOR) !== null ||
-                                            Tokenizer.getTokenAttr(startTagToken, ATTRS.SIZE) !== null ||
-                                            Tokenizer.getTokenAttr(startTagToken, ATTRS.FACE) !== null);
-
-    return isFontWithAttrs ? true : EXITS_FOREIGN_CONTENT[tn];
-};
-
-//Token adjustments
-exports.adjustTokenMathMLAttrs = function (token) {
-    for (var i = 0; i < token.attrs.length; i++) {
-        if (token.attrs[i].name === DEFINITION_URL_ATTR) {
-            token.attrs[i].name = ADJUSTED_DEFINITION_URL_ATTR;
-            break;
-        }
-    }
-};
-
-exports.adjustTokenSVGAttrs = function (token) {
-    for (var i = 0; i < token.attrs.length; i++) {
-        var adjustedAttrName = SVG_ATTRS_ADJUSTMENT_MAP[token.attrs[i].name];
-
-        if (adjustedAttrName)
-            token.attrs[i].name = adjustedAttrName;
-    }
-};
-
-exports.adjustTokenXMLAttrs = function (token) {
-    for (var i = 0; i < token.attrs.length; i++) {
-        var adjustedAttrEntry = XML_ATTRS_ADJUSTMENT_MAP[token.attrs[i].name];
-
-        if (adjustedAttrEntry) {
-            token.attrs[i].prefix = adjustedAttrEntry.prefix;
-            token.attrs[i].name = adjustedAttrEntry.name;
-            token.attrs[i].namespace = adjustedAttrEntry.namespace;
-        }
-    }
-};
-
-exports.adjustTokenSVGTagName = function (token) {
-    var adjustedTagName = SVG_TAG_NAMES_ADJUSTMENT_MAP[token.tagName];
-
-    if (adjustedTagName)
-        token.tagName = adjustedTagName;
-};
-
-//Integration points
-function isMathMLTextIntegrationPoint(tn, ns) {
-    return ns === NS.MATHML && (tn === $.MI || tn === $.MO || tn === $.MN || tn === $.MS || tn === $.MTEXT);
-}
-
-function isHtmlIntegrationPoint(tn, ns, attrs) {
-    if (ns === NS.MATHML && tn === $.ANNOTATION_XML) {
-        for (var i = 0; i < attrs.length; i++) {
-            if (attrs[i].name === ATTRS.ENCODING) {
-                var value = attrs[i].value.toLowerCase();
-
-                return value === MIME_TYPES.TEXT_HTML || value === MIME_TYPES.APPLICATION_XML;
-            }
-        }
-    }
-
-    return ns === NS.SVG && (tn === $.FOREIGN_OBJECT || tn === $.DESC || tn === $.TITLE);
-}
-
-exports.isIntegrationPoint = function (tn, ns, attrs, foreignNS) {
-    if ((!foreignNS || foreignNS === NS.HTML) && isHtmlIntegrationPoint(tn, ns, attrs))
-        return true;
-
-    if ((!foreignNS || foreignNS === NS.MATHML) && isMathMLTextIntegrationPoint(tn, ns))
-        return true;
-
-    return false;
-};

package/lib/extensions/location_info/open_element_stack_mixin.js

@@ -1,34 +0,0 @@
-'use strict';
-
-var Mixin = require('../../utils/mixin'),
-    inherits = require('util').inherits;
-
-var LocationInfoOpenElementStackMixin = module.exports = function (stack, options) {
-    Mixin.call(this, stack);
-
-    this.onItemPop = options.onItemPop;
-};
-
-inherits(LocationInfoOpenElementStackMixin, Mixin);
-
-LocationInfoOpenElementStackMixin.prototype._getOverriddenMethods = function (mxn, orig) {
-    return {
-        pop: function () {
-            mxn.onItemPop(this.current);
-            orig.pop.call(this);
-        },
-
-        popAllUpToHtmlElement: function () {
-            for (var i = this.stackTop; i > 0; i--)
-                mxn.onItemPop(this.items[i]);
-
-            orig.popAllUpToHtmlElement.call(this);
-        },
-
-        remove: function (element) {
-            mxn.onItemPop(this.current);
-            orig.remove.call(this, element);
-        }
-    };
-};
-

package/lib/extensions/location_info/parser_mixin.js

@@ -1,213 +0,0 @@
-'use strict';
-
-var Mixin = require('../../utils/mixin'),
-    Tokenizer = require('../../tokenizer'),
-    LocationInfoTokenizerMixin = require('./tokenizer_mixin'),
-    PositionTrackingPreprocessorMixin = require('../position_tracking/preprocessor_mixin'),
-    LocationInfoOpenElementStackMixin = require('./open_element_stack_mixin'),
-    HTML = require('../../common/html'),
-    inherits = require('util').inherits;
-
-
-//Aliases
-var $ = HTML.TAG_NAMES;
-
-var LocationInfoParserMixin = module.exports = function (parser) {
-    Mixin.call(this, parser);
-
-    this.parser = parser;
-    this.posTracker = null;
-    this.lastStartTagToken = null;
-    this.lastFosterParentingLocation = null;
-    this.currentToken = null;
-};
-
-inherits(LocationInfoParserMixin, Mixin);
-
-
-LocationInfoParserMixin.prototype._setStartLocation = function (element) {
-    if (this.lastStartTagToken) {
-        element.__location = Object.create(this.lastStartTagToken.location);
-        element.__location.startTag = this.lastStartTagToken.location;
-    }
-    else
-        element.__location = null;
-};
-
-LocationInfoParserMixin.prototype._setEndLocation = function (element, closingToken) {
-    var loc = element.__location;
-
-    if (loc) {
-        if (closingToken.location) {
-            var ctLoc = closingToken.location,
-                tn = this.parser.treeAdapter.getTagName(element);
-
-            // NOTE: For cases like <p> <p> </p> - First 'p' closes without a closing
-            // tag and for cases like <td> <p> </td> - 'p' closes without a closing tag.
-            var isClosingEndTag = closingToken.type === Tokenizer.END_TAG_TOKEN && tn === closingToken.tagName;
-
-            if (isClosingEndTag) {
-                loc.endTag = Object.create(ctLoc);
-                loc.endOffset = ctLoc.endOffset;
-            }
-
-            else
-                loc.endOffset = ctLoc.startOffset;
-        }
-
-        else if (closingToken.type === Tokenizer.EOF_TOKEN)
-            loc.endOffset = this.posTracker.offset;
-    }
-};
-
-LocationInfoParserMixin.prototype._getOverriddenMethods = function (mxn, orig) {
-    return {
-        _bootstrap: function (document, fragmentContext) {
-            orig._bootstrap.call(this, document, fragmentContext);
-
-            mxn.lastStartTagToken = null;
-            mxn.lastFosterParentingLocation = null;
-            mxn.currentToken = null;
-            mxn.posTracker = new PositionTrackingPreprocessorMixin(this.tokenizer.preprocessor);
-
-            new LocationInfoTokenizerMixin(this.tokenizer);
-
-            new LocationInfoOpenElementStackMixin(this.openElements, {
-                onItemPop: function (element) {
-                    mxn._setEndLocation(element, mxn.currentToken);
-                }
-            });
-        },
-
-        _runParsingLoop: function (scriptHandler) {
-            orig._runParsingLoop.call(this, scriptHandler);
-
-            // NOTE: generate location info for elements
-            // that remains on open element stack
-            for (var i = this.openElements.stackTop; i >= 0; i--)
-                mxn._setEndLocation(this.openElements.items[i], mxn.currentToken);
-        },
-
-
-        //Token processing
-        _processTokenInForeignContent: function (token) {
-            mxn.currentToken = token;
-            orig._processTokenInForeignContent.call(this, token);
-        },
-
-        _processToken: function (token) {
-            mxn.currentToken = token;
-            orig._processToken.call(this, token);
-
-            //NOTE: <body> and <html> are never popped from the stack, so we need to updated
-            //their end location explicitly.
-            var requireExplicitUpdate = token.type === Tokenizer.END_TAG_TOKEN &&
-                                        (token.tagName === $.HTML ||
-                                         token.tagName === $.BODY && this.openElements.hasInScope($.BODY));
-
-            if (requireExplicitUpdate) {
-                for (var i = this.openElements.stackTop; i >= 0; i--) {
-                    var element = this.openElements.items[i];
-
-                    if (this.treeAdapter.getTagName(element) === token.tagName) {
-                        mxn._setEndLocation(element, token);
-                        break;
-                    }
-                }
-            }
-        },
-
-
-        //Doctype
-        _setDocumentType: function (token) {
-            orig._setDocumentType.call(this, token);
-
-            var documentChildren = this.treeAdapter.getChildNodes(this.document),
-                cnLength = documentChildren.length;
-
-            for (var i = 0; i < cnLength; i++) {
-                var node = documentChildren[i];
-
-                if (this.treeAdapter.isDocumentTypeNode(node)) {
-                    node.__location = token.location;
-                    break;
-                }
-            }
-        },
-
-
-        //Elements
-        _attachElementToTree: function (element) {
-            //NOTE: _attachElementToTree is called from _appendElement, _insertElement and _insertTemplate methods.
-            //So we will use token location stored in this methods for the element.
-            mxn._setStartLocation(element);
-            mxn.lastStartTagToken = null;
-            orig._attachElementToTree.call(this, element);
-        },
-
-        _appendElement: function (token, namespaceURI) {
-            mxn.lastStartTagToken = token;
-            orig._appendElement.call(this, token, namespaceURI);
-        },
-
-        _insertElement: function (token, namespaceURI) {
-            mxn.lastStartTagToken = token;
-            orig._insertElement.call(this, token, namespaceURI);
-        },
-
-        _insertTemplate: function (token) {
-            mxn.lastStartTagToken = token;
-            orig._insertTemplate.call(this, token);
-
-            var tmplContent = this.treeAdapter.getTemplateContent(this.openElements.current);
-
-            tmplContent.__location = null;
-        },
-
-        _insertFakeRootElement: function () {
-            orig._insertFakeRootElement.call(this);
-            this.openElements.current.__location = null;
-        },
-
-        //Comments
-        _appendCommentNode: function (token, parent) {
-            orig._appendCommentNode.call(this, token, parent);
-
-            var children = this.treeAdapter.getChildNodes(parent),
-                commentNode = children[children.length - 1];
-
-            commentNode.__location = token.location;
-        },
-
-        //Text
-        _findFosterParentingLocation: function () {
-            //NOTE: store last foster parenting location, so we will be able to find inserted text
-            //in case of foster parenting
-            mxn.lastFosterParentingLocation = orig._findFosterParentingLocation.call(this);
-
-            return mxn.lastFosterParentingLocation;
-        },
-
-        _insertCharacters: function (token) {
-            orig._insertCharacters.call(this, token);
-
-            var hasFosterParent = this._shouldFosterParentOnInsertion(),
-                parent = hasFosterParent && mxn.lastFosterParentingLocation.parent ||
-                         this.openElements.currentTmplContent ||
-                         this.openElements.current,
-                siblings = this.treeAdapter.getChildNodes(parent),
-                textNodeIdx = hasFosterParent && mxn.lastFosterParentingLocation.beforeElement ?
-                siblings.indexOf(mxn.lastFosterParentingLocation.beforeElement) - 1 :
-                siblings.length - 1,
-                textNode = siblings[textNodeIdx];
-
-            //NOTE: if we have location assigned by another token, then just update end position
-            if (textNode.__location)
-                textNode.__location.endOffset = token.location.endOffset;
-
-            else
-                textNode.__location = token.location;
-        }
-    };
-};
-