@applitools/dom-snapshot - npm Package Compare versions

Comparing version 1.2.6 to 1.2.7

dist/processPage.js

@@ -1,2 +0,2 @@
-// @applitools/dom-snapshot@1.2.6
+// @applitools/dom-snapshot@1.2.7
 function __processPage() {
@@ -22,3 +22,3 @@ var processPage = (function () {
       .map(hrefEl => hrefEl.getAttribute('href') || hrefEl.getAttribute('xlink:href'))
-      .filter(Boolean);
+      .filter(u => u && u[0] !== '#');
 
@@ -250,3 +250,3 @@ const objectUrls = [...doc.querySelectorAll('object')]
     extractResourcesFromStyleSheet,
-    _extractResourcesFromSvg,
+    extractResourcesFromSvg,
     isSameOrigin,
@@ -277,9 +277,12 @@ cache = {},
               if (styleSheet) {
-                resourceUrls = extractResourcesFromStyleSheet(styleSheet, doc.defaultView)
-                  .map(resourceUrl => absolutizeUrl_1(resourceUrl, url.replace(/^blob:/, '')))
-                  .filter(filterInlineUrl_1);
+                resourceUrls = extractResourcesFromStyleSheet(styleSheet, doc.defaultView);
               }
-            } else if (/svg/.test(type)) ;
+            } else if (/svg/.test(type)) {
+              resourceUrls = extractResourcesFromSvg({svgArrayBuffer: value});
+            }
 
             if (resourceUrls) {
+              resourceUrls = resourceUrls
+                .map(resourceUrl => absolutizeUrl_1(resourceUrl, url.replace(/^blob:/, '')))
+                .filter(filterInlineUrl_1);
               result = getResourceUrlsAndBlobs(baseUrl, resourceUrls).then(
@@ -310,9 +313,11 @@ ({resourceUrls, blobsObj}) => ({
 
-  function extractResourcesFromSvg(svgArrayBuffer, testDomParser) {
+  function extractResourcesFromSvg({svgArrayBuffer, parser, decoder}) {
     let svgStr;
     let urls = [];
     try {
-      svgStr = String.fromCharCode.apply(null, new Uint8Array(svgArrayBuffer));
-      const domparser = testDomParser || new DOMParser();
+      const decooder = decoder || new TextDecoder('utf-8');
+      svgStr = decooder.decode(svgArrayBuffer);
+      const domparser = parser || new DOMParser();
       const doc = domparser.parseFromString(svgStr, 'image/svg+xml');
+
       const fromImages = Array.from(doc.getElementsByTagName('image'))
@@ -324,3 +329,3 @@ .concat(Array.from(doc.getElementsByTagName('use')))
       );
-      urls = [...fromImages, ...fromObjects];
+      urls = [...fromImages, ...fromObjects].filter(u => u[0] !== '#');
     } catch (e) {
@@ -327,0 +332,0 @@ console.log('could not parse svg content', e);

dist/processPageAndPoll.js

@@ -1,2 +0,2 @@
-// @applitools/dom-snapshot@1.2.6
+// @applitools/dom-snapshot@1.2.7
 function __processPageAndPoll() {
@@ -74,3 +74,3 @@ var processPageAndPoll = (function () {
       .map(hrefEl => hrefEl.getAttribute('href') || hrefEl.getAttribute('xlink:href'))
-      .filter(Boolean);
+      .filter(u => u && u[0] !== '#');
 
@@ -302,3 +302,3 @@ const objectUrls = [...doc.querySelectorAll('object')]
     extractResourcesFromStyleSheet,
-    _extractResourcesFromSvg,
+    extractResourcesFromSvg,
     isSameOrigin,
@@ -329,9 +329,12 @@ cache = {},
               if (styleSheet) {
-                resourceUrls = extractResourcesFromStyleSheet(styleSheet, doc.defaultView)
-                  .map(resourceUrl => absolutizeUrl_1(resourceUrl, url.replace(/^blob:/, '')))
-                  .filter(filterInlineUrl_1);
+                resourceUrls = extractResourcesFromStyleSheet(styleSheet, doc.defaultView);
               }
-            } else if (/svg/.test(type)) ;
+            } else if (/svg/.test(type)) {
+              resourceUrls = extractResourcesFromSvg({svgArrayBuffer: value});
+            }
 
             if (resourceUrls) {
+              resourceUrls = resourceUrls
+                .map(resourceUrl => absolutizeUrl_1(resourceUrl, url.replace(/^blob:/, '')))
+                .filter(filterInlineUrl_1);
               result = getResourceUrlsAndBlobs(baseUrl, resourceUrls).then(
@@ -362,9 +365,11 @@ ({resourceUrls, blobsObj}) => ({
 
-  function extractResourcesFromSvg(svgArrayBuffer, testDomParser) {
+  function extractResourcesFromSvg({svgArrayBuffer, parser, decoder}) {
     let svgStr;
     let urls = [];
     try {
-      svgStr = String.fromCharCode.apply(null, new Uint8Array(svgArrayBuffer));
-      const domparser = testDomParser || new DOMParser();
+      const decooder = decoder || new TextDecoder('utf-8');
+      svgStr = decooder.decode(svgArrayBuffer);
+      const domparser = parser || new DOMParser();
       const doc = domparser.parseFromString(svgStr, 'image/svg+xml');
+
       const fromImages = Array.from(doc.getElementsByTagName('image'))
@@ -376,3 +381,3 @@ .concat(Array.from(doc.getElementsByTagName('use')))
       );
-      urls = [...fromImages, ...fromObjects];
+      urls = [...fromImages, ...fromObjects].filter(u => u[0] !== '#');
     } catch (e) {
@@ -379,0 +384,0 @@ console.log('could not parse svg content', e);

dist/processPageAndSerialize.js

@@ -1,2 +0,2 @@
-// @applitools/dom-snapshot@1.2.6
+// @applitools/dom-snapshot@1.2.7
 function __processPageAndSerialize() {
@@ -74,3 +74,3 @@ var processPageAndSerialize = (function () {
       .map(hrefEl => hrefEl.getAttribute('href') || hrefEl.getAttribute('xlink:href'))
-      .filter(Boolean);
+      .filter(u => u && u[0] !== '#');
 
@@ -302,3 +302,3 @@ const objectUrls = [...doc.querySelectorAll('object')]
     extractResourcesFromStyleSheet,
-    _extractResourcesFromSvg,
+    extractResourcesFromSvg,
     isSameOrigin,
@@ -329,9 +329,12 @@ cache = {},
               if (styleSheet) {
-                resourceUrls = extractResourcesFromStyleSheet(styleSheet, doc.defaultView)
-                  .map(resourceUrl => absolutizeUrl_1(resourceUrl, url.replace(/^blob:/, '')))
-                  .filter(filterInlineUrl_1);
+                resourceUrls = extractResourcesFromStyleSheet(styleSheet, doc.defaultView);
               }
-            } else if (/svg/.test(type)) ;
+            } else if (/svg/.test(type)) {
+              resourceUrls = extractResourcesFromSvg({svgArrayBuffer: value});
+            }
 
             if (resourceUrls) {
+              resourceUrls = resourceUrls
+                .map(resourceUrl => absolutizeUrl_1(resourceUrl, url.replace(/^blob:/, '')))
+                .filter(filterInlineUrl_1);
               result = getResourceUrlsAndBlobs(baseUrl, resourceUrls).then(
@@ -362,9 +365,11 @@ ({resourceUrls, blobsObj}) => ({
 
-  function extractResourcesFromSvg(svgArrayBuffer, testDomParser) {
+  function extractResourcesFromSvg({svgArrayBuffer, parser, decoder}) {
     let svgStr;
     let urls = [];
     try {
-      svgStr = String.fromCharCode.apply(null, new Uint8Array(svgArrayBuffer));
-      const domparser = testDomParser || new DOMParser();
+      const decooder = decoder || new TextDecoder('utf-8');
+      svgStr = decooder.decode(svgArrayBuffer);
+      const domparser = parser || new DOMParser();
       const doc = domparser.parseFromString(svgStr, 'image/svg+xml');
+
       const fromImages = Array.from(doc.getElementsByTagName('image'))
@@ -376,3 +381,3 @@ .concat(Array.from(doc.getElementsByTagName('use')))
       );
-      urls = [...fromImages, ...fromObjects];
+      urls = [...fromImages, ...fromObjects].filter(u => u[0] !== '#');
     } catch (e) {
@@ -379,0 +384,0 @@ console.log('could not parse svg content', e);

dist/processPageCjs.js

@@ -19,3 +19,3 @@ 'use strict';
     .map(hrefEl => hrefEl.getAttribute('href') || hrefEl.getAttribute('xlink:href'))
-    .filter(Boolean);
+    .filter(u => u && u[0] !== '#');
 
@@ -247,3 +247,3 @@ const objectUrls = [...doc.querySelectorAll('object')]
   extractResourcesFromStyleSheet,
-  _extractResourcesFromSvg,
+  extractResourcesFromSvg,
   isSameOrigin,
@@ -274,9 +274,12 @@ cache = {},
             if (styleSheet) {
-              resourceUrls = extractResourcesFromStyleSheet(styleSheet, doc.defaultView)
-                .map(resourceUrl => absolutizeUrl_1(resourceUrl, url.replace(/^blob:/, '')))
-                .filter(filterInlineUrl_1);
+              resourceUrls = extractResourcesFromStyleSheet(styleSheet, doc.defaultView);
             }
-          } else if (/svg/.test(type)) ;
+          } else if (/svg/.test(type)) {
+            resourceUrls = extractResourcesFromSvg({svgArrayBuffer: value});
+          }
 
           if (resourceUrls) {
+            resourceUrls = resourceUrls
+              .map(resourceUrl => absolutizeUrl_1(resourceUrl, url.replace(/^blob:/, '')))
+              .filter(filterInlineUrl_1);
             result = getResourceUrlsAndBlobs(baseUrl, resourceUrls).then(
@@ -307,9 +310,11 @@ ({resourceUrls, blobsObj}) => ({
 
-function extractResourcesFromSvg(svgArrayBuffer, testDomParser) {
+function extractResourcesFromSvg({svgArrayBuffer, parser, decoder}) {
   let svgStr;
   let urls = [];
   try {
-    svgStr = String.fromCharCode.apply(null, new Uint8Array(svgArrayBuffer));
-    const domparser = testDomParser || new DOMParser();
+    const decooder = decoder || new TextDecoder('utf-8');
+    svgStr = decooder.decode(svgArrayBuffer);
+    const domparser = parser || new DOMParser();
     const doc = domparser.parseFromString(svgStr, 'image/svg+xml');
+
     const fromImages = Array.from(doc.getElementsByTagName('image'))
@@ -321,3 +326,3 @@ .concat(Array.from(doc.getElementsByTagName('use')))
     );
-    urls = [...fromImages, ...fromObjects];
+    urls = [...fromImages, ...fromObjects].filter(u => u[0] !== '#');
   } catch (e) {
@@ -324,0 +329,0 @@ console.log('could not parse svg content', e);

package.json

 {
   "name": "@applitools/dom-snapshot",
-  "version": "1.2.6",
+  "version": "1.2.7",
   "main": "index.js",
@@ -5,0 +5,0 @@ "license": "MIT",

src/browser/extractLinks.js

@@ -19,3 +19,3 @@ 'use strict';
     .map(hrefEl => hrefEl.getAttribute('href') || hrefEl.getAttribute('xlink:href'))
-    .filter(Boolean);
+    .filter(u => u && u[0] !== '#');
 
@@ -22,0 +22,0 @@ const objectUrls = [...doc.querySelectorAll('object')]

src/browser/extractResourcesFromSvg.js

 'use strict';
 
-function extractResourcesFromSvg(svgArrayBuffer, testDomParser) {
+function extractResourcesFromSvg({svgArrayBuffer, parser, decoder}) {
   let svgStr;
   let urls = [];
   try {
-    svgStr = String.fromCharCode.apply(null, new Uint8Array(svgArrayBuffer));
-    const domparser = testDomParser || new DOMParser();
+    const decooder = decoder || new TextDecoder('utf-8');
+    svgStr = decooder.decode(svgArrayBuffer);
+    const domparser = parser || new DOMParser();
     const doc = domparser.parseFromString(svgStr, 'image/svg+xml');
+
     const fromImages = Array.from(doc.getElementsByTagName('image'))
@@ -16,3 +18,3 @@ .concat(Array.from(doc.getElementsByTagName('use')))
     );
-    urls = [...fromImages, ...fromObjects];
+    urls = [...fromImages, ...fromObjects].filter(u => u[0] !== '#');
   } catch (e) {
@@ -19,0 +21,0 @@ console.log('could not parse svg content', e);

src/browser/processResource.js

@@ -9,3 +9,3 @@ 'use strict';
   extractResourcesFromStyleSheet,
-  _extractResourcesFromSvg,
+  extractResourcesFromSvg,
   isSameOrigin,
@@ -36,13 +36,12 @@ cache = {},
             if (styleSheet) {
-              resourceUrls = extractResourcesFromStyleSheet(styleSheet, doc.defaultView)
-                .map(resourceUrl => absolutizeUrl(resourceUrl, url.replace(/^blob:/, '')))
-                .filter(filterInlineUrl);
+              resourceUrls = extractResourcesFromStyleSheet(styleSheet, doc.defaultView);
             }
           } else if (/svg/.test(type)) {
-            // resourceUrls = extractResourcesFromSvg(value).map(resourceUrl =>
-            //   absolutizeUrl(resourceUrl, url),
-            // );
+            resourceUrls = extractResourcesFromSvg({svgArrayBuffer: value});
           }
 
           if (resourceUrls) {
+            resourceUrls = resourceUrls
+              .map(resourceUrl => absolutizeUrl(resourceUrl, url.replace(/^blob:/, '')))
+              .filter(filterInlineUrl);
             result = getResourceUrlsAndBlobs(baseUrl, resourceUrls).then(
@@ -49,0 +48,0 @@ ({resourceUrls, blobsObj}) => ({

No alert changes

Improved metrics

Total package byte prevSize

98897

increased by0.83%

Lines of code

2535

increased by0.64%

No dependency changes