parse5-sax-parser 5.0.0 → 6.0.1

package/LICENSE

@@ -0,0 +1,19 @@
+Copyright (c) 2013-2019 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/index.js

@@ -14,7 +14,7 @@ const DEFAULT_OPTIONS = {
 
 class SAXParser extends Transform {
     constructor(options) {
-        super();
+        super({ encoding: 'utf8', decodeStrings: false });
 
         this.options = mergeOptions(DEFAULT_OPTIONS, options);
 
@@ -28,7 +28,6 @@ class SAXParser extends Transform {
         this.parserFeedbackSimulator = new ParserFeedbackSimulator(this.tokenizer);
 
         this.pendingText = null;
-        this.currentTokenLocation = void 0;
 
         this.lastChunkWritten = false;
         this.stopped = false;
@@ -41,19 +40,16 @@ class SAXParser extends Transform {
 
     //TransformStream implementation
     _transform(chunk, encoding, callback) {
-        this._parseChunk(chunk);
-        this.push(chunk);
-
-        callback();
-    }
+        if (typeof chunk !== 'string') {
+            throw new TypeError('Parser can work only with string streams.');
+        }
 
-    _flush(callback) {
-        callback();
+        callback(null, this._transformChunk(chunk));
     }
 
-    end(chunk, encoding, callback) {
+    _final(callback) {
         this.lastChunkWritten = true;
-        super.end(chunk, encoding, callback);
+        callback(null, this._transformChunk(''));
     }
 
     stop() {
@@ -61,11 +57,12 @@ class SAXParser extends Transform {
     }
 
     //Internals
-    _parseChunk(chunk) {
+    _transformChunk(chunk) {
         if (!this.stopped) {
-            this.tokenizer.write(chunk.toString('utf8'), this.lastChunkWritten);
+            this.tokenizer.write(chunk, this.lastChunkWritten);
             this._runParsingLoop();
         }
+        return chunk;
     }
 
     _runParsingLoop() {
@@ -83,15 +80,21 @@ class SAXParser extends Transform {
                 token.type === Tokenizer.WHITESPACE_CHARACTER_TOKEN ||
                 token.type === Tokenizer.NULL_CHARACTER_TOKEN
             ) {
-                if (this.options.sourceCodeLocationInfo) {
-                    if (this.pendingText === null) {
-                        this.currentTokenLocation = token.location;
-                    } else {
-                        this.currentTokenLocation.endOffset = token.location.endOffset;
+                if (this.pendingText === null) {
+                    token.type = Tokenizer.CHARACTER_TOKEN;
+                    this.pendingText = token;
+                } else {
+                    this.pendingText.chars += token.chars;
+
+                    if (this.options.sourceCodeLocationInfo) {
+                        const { endLine, endCol, endOffset } = token.location;
+                        Object.assign(this.pendingText.location, {
+                            endLine,
+                            endCol,
+                            endOffset
+                        });
                     }
                 }
-
-                this.pendingText = (this.pendingText || '') + token.chars;
             } else {
                 this._emitPendingText();
                 this._handleToken(token);
@@ -100,58 +103,64 @@ class SAXParser extends Transform {
     }
 
     _handleToken(token) {
-        if (this.options.sourceCodeLocationInfo) {
-            this.currentTokenLocation = token.location;
+        if (token.type === Tokenizer.EOF_TOKEN) {
+            return true;
         }
 
-        if (token.type === Tokenizer.START_TAG_TOKEN) {
-            this.emit('startTag', this._reshapeStartTagToken(token));
-        } else if (token.type === Tokenizer.END_TAG_TOKEN) {
-            this.emit('endTag', this._reshapeEndTagToken(token));
-        } else if (token.type === Tokenizer.COMMENT_TOKEN) {
-            this.emit('comment', this._reshapeCommentToken(token));
-        } else if (token.type === Tokenizer.DOCTYPE_TOKEN) {
-            this.emit('doctype', this._reshapeDoctypeToken(token));
+        const { eventName, reshapeToken } = TOKEN_EMISSION_HELPERS[token.type];
+
+        if (this.listenerCount(eventName) === 0) {
+            return false;
         }
+
+        this._emitToken(eventName, reshapeToken(token));
+
+        return true;
+    }
+
+    _emitToken(eventName, token) {
+        this.emit(eventName, token);
     }
 
     _emitPendingText() {
         if (this.pendingText !== null) {
-            this.emit('text', this._createTextToken());
+            this._handleToken(this.pendingText);
             this.pendingText = null;
         }
     }
+}
 
-    // Tokens
-    _createTextToken() {
-        return { text: this.pendingText, sourceCodeLocation: this.currentTokenLocation };
-    }
-
-    _reshapeStartTagToken(origToken) {
-        return {
+const TOKEN_EMISSION_HELPERS = {
+    [Tokenizer.START_TAG_TOKEN]: {
+        eventName: 'startTag',
+        reshapeToken: origToken => ({
             tagName: origToken.tagName,
             attrs: origToken.attrs,
             selfClosing: origToken.selfClosing,
-            sourceCodeLocation: this.currentTokenLocation
-        };
-    }
-
-    _reshapeEndTagToken(origToken) {
-        return { tagName: origToken.tagName, sourceCodeLocation: this.currentTokenLocation };
-    }
-
-    _reshapeCommentToken(origToken) {
-        return { text: origToken.data, sourceCodeLocation: this.currentTokenLocation };
-    }
-
-    _reshapeDoctypeToken(origToken) {
-        return {
+            sourceCodeLocation: origToken.location
+        })
+    },
+    [Tokenizer.END_TAG_TOKEN]: {
+        eventName: 'endTag',
+        reshapeToken: origToken => ({ tagName: origToken.tagName, sourceCodeLocation: origToken.location })
+    },
+    [Tokenizer.COMMENT_TOKEN]: {
+        eventName: 'comment',
+        reshapeToken: origToken => ({ text: origToken.data, sourceCodeLocation: origToken.location })
+    },
+    [Tokenizer.DOCTYPE_TOKEN]: {
+        eventName: 'doctype',
+        reshapeToken: origToken => ({
             name: origToken.name,
             publicId: origToken.publicId,
             systemId: origToken.systemId,
-            sourceCodeLocation: this.currentTokenLocation
-        };
+            sourceCodeLocation: origToken.location
+        })
+    },
+    [Tokenizer.CHARACTER_TOKEN]: {
+        eventName: 'text',
+        reshapeToken: origToken => ({ text: origToken.chars, sourceCodeLocation: origToken.location })
     }
-}
+};
 
 module.exports = SAXParser;

package/package.json

@@ -1,19 +1,28 @@
 {
     "name": "parse5-sax-parser",
     "description": "Streaming SAX-style HTML parser.",
-    "version": "5.0.0",
+    "version": "6.0.1",
     "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": ["parse5", "parser", "stream", "streaming", "SAX"],
+    "keywords": [
+        "parse5",
+        "parser",
+        "stream",
+        "streaming",
+        "SAX"
+    ],
     "license": "MIT",
     "main": "./lib/index.js",
     "dependencies": {
-        "parse5": "^5.0.0"
+        "parse5": "^6.0.1"
     },
     "repository": {
         "type": "git",
         "url": "git://github.com/inikulin/parse5.git"
     },
-    "files": ["lib"]
+    "files": [
+        "lib"
+    ],
+    "gitHead": "37227a3429584903cbd1799dade995266fc2dbe6"
 }