fix tests

Author: SuttonKyle

dist/htmldiff.js

@@ -22,9 +22,7 @@
   ],
   "type": "module",
   "types": "dist/htmldiff.d.ts",
-  "dependencies": {
-    "xregexp": "^5.0.2"
-  },
+  "dependencies": {},
   "devDependencies": {
     "@typescript-eslint/eslint-plugin": "~4.16.1",
     "@typescript-eslint/parser": "~4.16.1",

dist/htmldiff.js.map

@@ -26,10 +26,6 @@
  *   == '<p>this is some <ins class="diff-class">more </ins>text</p>'
  */
 
-import XRegExp from 'xregexp';
-
-const unicodeLetterExpr = XRegExp('\\p{L}|\\d');
-
 function isEndOfTag(char: string): boolean {
   return char === '>';
 }
@@ -105,7 +101,6 @@ function isEndOfAtomicTag(word: string, tag: string){
 }
 
 const styleTagsRegExp = /^<(strong|em|b|i|q|cite|blockquote|mark|dfn|sup|sub|u|s|nobr)(^(?!\w)|>)/;
-const styleTagsClosingRegExp = /<\/(strong|em|b|i|q|cite|blockquote|mark|dfn|sup|sub|u|s|nobr)(^(?!\w)|>)/;
 
 /**
  * Checks if the current word is the beginning of an style tag. An style tag is one whose
@@ -300,7 +295,7 @@ export function htmlToTokens(html: string): Token[] {
           }
           currentWord = char;
           mode = 'whitespace';
-        } else if (unicodeLetterExpr.test(char)){
+        } else if (/[\w\d#@]/.test(char)){
           currentWord += char;
         } else if (/&/.test(char)){
           if (currentWord){
@@ -389,19 +384,6 @@ function getKeyForToken(token: string){
     return `<iframe src="${iframe[1]}"></iframe>`;
   }
 
-  // strip style tags from token key
-  if (styleTagsRegExp.test(token) || styleTagsClosingRegExp.test(token)) {
-    return token
-      .replace(styleTagsRegExp, '')
-      .replace(styleTagsClosingRegExp, '')
-      .replace(/(\s+|&nbsp;|&#160;)/g, ' ');
-  }
-  // if (styleTag) {
-  //   const styleTagClose = styleTagsClosingRegExp.exec(token);
-  //   const currentToken = (styleTagClose && styleTagClose[0]) ? token.split(styleTagClose[0])[0] ?? token : token;
-  //   return currentToken.replace('<nobr>', '');
-  // }
-
   // If the token is any other element, just grab the tag name.
   const tagName = /<([^\s>]+)[\s>]/.exec(token);
   if (tagName){
@@ -932,67 +914,6 @@ function combineTokenNotes(
   return segments.map(mapFn).join('');
 }
 
-// var nobrOpenRegExp = /<nobr>/g;
-// var nobrCloseRegExp = /<\/nobr>/g;
-
-/**
- * Ensures that a string does not have a truncated <nobr> tag.
- */
-// function wrapNobr(content) {
-//     console.log(content)
-//     var currentContent = content
-//     var currentOpenTags = 0;
-//     var isInTag = false;
-//     var currentTag = "";
-//     var shouldAddStartTag = false;
-//     for (var charIdx = 0; charIdx < content.length; charIdx++) {
-//         var char = content[charIdx];
-//         if (isInTag) {
-//             currentTag += char;
-//             if (char === ">") {
-//                 if (nobrOpenRegExp.test(currentTag)) {
-//                     currentOpenTags += 1;
-//                 } else if (nobrCloseRegExp.test(currentTag)) {
-//                     currentOpenTags -= 1;
-//                     if (currentOpenTags < 0) {
-//                         shouldAddStartTag = true;
-//                         currentOpenTags = 0;
-//                     }
-//                 }
-//                 currentTag = "";
-//                 isInTag = false;
-//             }
-//         } else if (char === "<") {
-//             isInTag = true;
-//             currentTag += char;
-//         }
-//     }
-//     if (currentOpenTags > 0) {
-//         currentContent = content + "</nobr>";
-//     }
-//     if (shouldAddStartTag) {
-//         currentContent = "<nobr>" + currentContent;
-//     }
-//     console.log(currentContent);
-//     return currentContent;
-// }
-
-// /**
-//  * Ensures that a string does not have a truncated <nobr> tag.
-//  */
-// function wrapNobr(content: string) {
-//   const nobrOpenRegExp = /<nobr>/g;
-//   const nobrCloseRegExp = /<\/nobr>/g;
-//   const openNobr = content.match(nobrOpenRegExp) || [];
-//   const closeNobr = content.match(nobrCloseRegExp) || [];
-//   if (openNobr.length > closeNobr.length) {
-//       return content + '</nobr>';
-//   } else if (closeNobr.length > openNobr.length) {
-//       return '<nobr>' + content;
-//   }
-//   return content;
-// }
-
 function arrayDiff(a1: string[], a2: string[]) {
   let beforeArray: string[] = [];
   let afterArray: string[] = [];

package-lock.json

@@ -1,12 +1,12 @@
-import {htmlToTokens, createToken, createSegment, findBestMatch, findMatchingBlocks, createMap} from "../dist/htmldiff.js";
+import {createMap, createSegment, createToken, findBestMatch, findMatchingBlocks, htmlToTokens} from '../dist/htmldiff.js';
 
 describe('findMatchingBlocks', function(){
-    var cut, res, tokenize;
+    let cut, res, tokenize;
 
     beforeEach(function(){
         tokenize = function(tokens){
             return tokens.map(function(token){
-                return createToken(token);
+                return createToken(token, []);
             });
         };
     });
@@ -25,40 +25,40 @@ describe('findMatchingBlocks', function(){
                 res = cut(tokenize(['a', 'apple', 'has', 'a', 'worm']));
             });
 
-            it('should find "a" twice', function(){
-                expect(res['a'].length).to.equal(2);
+            it('should find "a[]" twice', function(){
+                expect(res['a[]'].length).to.equal(2);
             });
 
             it('should find "a" at 0', function(){
-                expect(res['a'][0]).to.equal(0);
+                expect(res['a[]'][0]).to.equal(0);
             });
 
             it('should find "a" at 3', function(){
-                expect(res['a'][1]).to.equal(3);
+                expect(res['a[]'][1]).to.equal(3);
             });
 
             it('should find "has" at 2', function(){
-                expect(res['has'][0]).to.equal(2);
+                expect(res['has[]'][0]).to.equal(2);
             });
         });
     });
 
     describe('findBestMatch', function(){
-        var invoke;
+        let invoke;
 
         beforeEach(function(){
             cut = findBestMatch;
             invoke = function(before, after){
-                var segment = createSegment(before, after, 0, 0);
+                const segment = createSegment(before, after, 0, 0);
 
                 res = cut(segment);
             };
         });
 
         describe('When there is a match', function(){
             beforeEach(function(){
-                var before = tokenize(['a', 'dog', 'bites']);
-                var after = tokenize(['a', 'dog', 'bites', 'a', 'man']);
+                const before = tokenize(['a', 'dog', 'bites']);
+                const after = tokenize(['a', 'dog', 'bites', 'a', 'man']);
                 invoke(before, after);
             });
 
@@ -90,8 +90,8 @@ describe('findMatchingBlocks', function(){
 
         describe('When there is no match', function(){
             beforeEach(function(){
-                var before = tokenize(['the', 'rat', 'sqeaks']);
-                var after = tokenize(['a', 'dog', 'bites', 'a', 'man']);
+                const before = tokenize(['the', 'rat', 'sqeaks']);
+                const after = tokenize(['a', 'dog', 'bites', 'a', 'man']);
                 invoke(before, after);
             });
 
@@ -102,7 +102,7 @@ describe('findMatchingBlocks', function(){
     });
 
     describe('findMatchingBlocks', function(){
-        var segment;
+        let segment;
 
         beforeEach(function(){
             cut = findMatchingBlocks;
@@ -114,8 +114,8 @@ describe('findMatchingBlocks', function(){
 
         describe('When called with a single match', function(){
             beforeEach(function(){
-                var before = htmlToTokens('a dog bites');
-                var after = htmlToTokens('when a dog bites it hurts');
+                const before = htmlToTokens('a dog bites');
+                const after = htmlToTokens('when a dog bites it hurts');
                 segment = createSegment(before, after, 0, 0);
 
                 res = cut(segment);
@@ -128,8 +128,8 @@ describe('findMatchingBlocks', function(){
 
         describe('When called with multiple matches', function(){
             beforeEach(function(){
-                var before = htmlToTokens('the dog bit a man');
-                var after = htmlToTokens('the large brown dog bit a tall man');
+                const before = htmlToTokens('the dog bit a man');
+                const after = htmlToTokens('the large brown dog bit a tall man');
                 segment = createSegment(before, after, 0, 0);
                 res = cut(segment);
             });