simple-html-tokenizer - npm Package Compare versions

Comparing version 0.5.4 to 0.5.5

dist/es6/index.js

@@ -347,2 +347,3 @@ /**
                 else if (char === '/') {
+                    this.delegate.finishAttributeValue();
                     this.consume();
@@ -499,2 +500,3 @@ this.transitionTo("selfClosingStartTag" /* selfClosingStartTag */);
         this.tokenizer = new EventedTokenizer(this, entityParser);
+        this._currentAttribute = undefined;
     }
@@ -541,11 +543,4 @@ Tokenizer.prototype.tokenize = function (input) {
     Tokenizer.prototype.currentAttribute = function () {
-        var attributes = this.current("StartTag" /* StartTag */).attributes;
-        if (attributes.length === 0) {
-            throw new Error('expected to have an attribute started');
-        }
-        return attributes[attributes.length - 1];
+        return this._currentAttribute;
     };
-    Tokenizer.prototype.pushAttribute = function (attribute) {
-        this.current("StartTag" /* StartTag */).attributes.push(attribute);
-    };
     Tokenizer.prototype.addLocInfo = function () {
@@ -621,3 +616,3 @@ if (this.options.loc) {
     Tokenizer.prototype.beginAttribute = function () {
-        this.pushAttribute(['', '', false]);
+        this._currentAttribute = ['', '', false];
     };
@@ -633,3 +628,5 @@ Tokenizer.prototype.appendToAttributeName = function (char) {
     };
-    Tokenizer.prototype.finishAttributeValue = function () { };
+    Tokenizer.prototype.finishAttributeValue = function () {
+        this.current("StartTag" /* StartTag */).attributes.push(this._currentAttribute);
+    };
     Tokenizer.prototype.reportSyntaxError = function (message) {
@@ -636,0 +633,0 @@ this.current().syntaxError = message;

dist/simple-html-tokenizer.js

@@ -353,2 +353,3 @@ (function (global, factory) {
                 else if (char === '/') {
+                    this.delegate.finishAttributeValue();
                     this.consume();
@@ -505,2 +506,3 @@ this.transitionTo("selfClosingStartTag" /* selfClosingStartTag */);
         this.tokenizer = new EventedTokenizer(this, entityParser);
+        this._currentAttribute = undefined;
     }
@@ -547,11 +549,4 @@ Tokenizer.prototype.tokenize = function (input) {
     Tokenizer.prototype.currentAttribute = function () {
-        var attributes = this.current("StartTag" /* StartTag */).attributes;
-        if (attributes.length === 0) {
-            throw new Error('expected to have an attribute started');
-        }
-        return attributes[attributes.length - 1];
+        return this._currentAttribute;
     };
-    Tokenizer.prototype.pushAttribute = function (attribute) {
-        this.current("StartTag" /* StartTag */).attributes.push(attribute);
-    };
     Tokenizer.prototype.addLocInfo = function () {
@@ -627,3 +622,3 @@ if (this.options.loc) {
     Tokenizer.prototype.beginAttribute = function () {
-        this.pushAttribute(['', '', false]);
+        this._currentAttribute = ['', '', false];
     };
@@ -639,3 +634,5 @@ Tokenizer.prototype.appendToAttributeName = function (char) {
     };
-    Tokenizer.prototype.finishAttributeValue = function () { };
+    Tokenizer.prototype.finishAttributeValue = function () {
+        this.current("StartTag" /* StartTag */).attributes.push(this._currentAttribute);
+    };
     Tokenizer.prototype.reportSyntaxError = function (message) {
@@ -642,0 +639,0 @@ this.current().syntaxError = message;

dist/types/tokenizer.d.ts

@@ -1,2 +0,2 @@
-import { Attribute, EntityParser, Token, TokenizerDelegate, TokenMap, TokenType, TokenizerOptions } from './types';
+import { EntityParser, Token, TokenizerDelegate, TokenMap, TokenType, TokenizerOptions } from './types';
 export default class Tokenizer implements TokenizerDelegate {
@@ -9,2 +9,3 @@ private options;
     private tokens;
+    private _currentAttribute?;
     constructor(entityParser: EntityParser, options?: TokenizerOptions);
@@ -19,4 +20,3 @@ tokenize(input: string): Token[];
     push(token: Token): void;
-    currentAttribute(): [string, string, boolean];
-    pushAttribute(attribute: Attribute): void;
+    currentAttribute(): [string, string, boolean] | undefined;
     addLocInfo(): void;
@@ -23,0 +23,0 @@ beginData(): void;

package.json

 {
   "name": "simple-html-tokenizer",
-  "version": "0.5.4",
+  "version": "0.5.5",
   "license": "MIT",
@@ -5,0 +5,0 @@ "description": "Simple HTML Tokenizer is a lightweight JavaScript library that can be used to tokenize the kind of HTML normally found in templates.",

src/evented-tokenizer.ts

@@ -404,2 +404,3 @@ import { preprocessInput, isAlpha, isSpace } from './utils';
       } else if (char === '/') {
+        this.delegate.finishAttributeValue();
         this.consume();
@@ -406,0 +407,0 @@ this.transitionTo(TokenizerState.selfClosingStartTag);

src/tokenizer.ts

@@ -18,2 +18,3 @@ import EventedTokenizer from './evented-tokenizer';
   private tokens: Token[] = [];
+  private _currentAttribute?: Attribute;
 
@@ -25,2 +26,3 @@ constructor(
     this.tokenizer = new EventedTokenizer(this, entityParser);
+    this._currentAttribute = undefined;
   }
@@ -80,13 +82,5 @@
   currentAttribute() {
-    let { attributes } = this.current(TokenType.StartTag);
-    if (attributes.length === 0) {
-      throw new Error('expected to have an attribute started');
-    }
-    return attributes[attributes.length - 1];
+    return this._currentAttribute;
   }
 
-  pushAttribute(attribute: Attribute) {
-    this.current(TokenType.StartTag).attributes.push(attribute);
-  }
-
   addLocInfo() {
@@ -179,18 +173,20 @@ if (this.options.loc) {
   beginAttribute() {
-    this.pushAttribute(['', '', false]);
+    this._currentAttribute = ['', '', false];
   }
 
   appendToAttributeName(char: string) {
-    this.currentAttribute()[0] += char;
+    this.currentAttribute()![0] += char;
   }
 
   beginAttributeValue(isQuoted: boolean) {
-    this.currentAttribute()[2] = isQuoted;
+    this.currentAttribute()![2] = isQuoted;
   }
 
   appendToAttributeValue(char: string) {
-    this.currentAttribute()[1] += char;
+    this.currentAttribute()![1] += char;
   }
 
-  finishAttributeValue() {}
+  finishAttributeValue() {
+    this.current(TokenType.StartTag).attributes.push(this._currentAttribute!);
+  }
 
@@ -197,0 +193,0 @@ reportSyntaxError(message: string) {

No alert changes

Worsened metrics

Total package byte prevSize

948401

-0.14%

Lines of code

10378

-0.08%

No dependency changes