@applitools/dom-capture - npm Package Compare versions

Comparing version 2.0.7 to 3.0.0

index.js

 const captureDom = require('./src/captureWindow');
 const captureFrame = require('./src/captureFrame');
+const getCaptureDomScript = require('./src/captureDomExport');
+const defaultDomProps = require('./src/defaultDomProps');
 module.exports = {
   captureDom,
-  captureFrame,
+  captureFrame, // backward compatibility. Can probably be removed on December 2018.
+  getCaptureDomScript,
+  defaultDomProps,
 };

package.json

 {
   "name": "@applitools/dom-capture",
-  "version": "2.0.7",
+  "version": "3.0.0",
   "main": "index.js",
@@ -9,3 +9,4 @@ "license": "MIT",
     "eslint": "eslint '**/*.js'",
-    "test": "yarn test:mocha && yarn eslint"
+    "test": "npm run test:mocha && npm run eslint",
+    "build": "rollup -c rollup.config.js"
   },
@@ -16,15 +17,24 @@ "engines": {
   "files": [
-    "src"
+    "src",
+    "dist"
   ],
   "devDependencies": {
-    "chai": "^4.1.2",
+    "chai": "^4.2.0",
     "eslint": "^4.19.1",
     "eslint-plugin-mocha-no-only": "^0.0.6",
     "eslint-plugin-node": "^6.0.1",
-    "eslint-plugin-prettier": "^2.6.0",
-    "express": "^4.16.3",
+    "eslint-plugin-prettier": "^2.7.0",
+    "express": "^4.16.4",
     "mocha": "^5.1.1",
-    "prettier": "^1.11.1",
-    "puppeteer": "^1.4.0"
+    "prettier": "^1.14.3",
+    "puppeteer": "^1.9.0",
+    "rollup": "^0.66.6",
+    "rollup-plugin-commonjs": "^9.2.0",
+    "rollup-plugin-node-builtins": "^2.1.2",
+    "rollup-plugin-node-globals": "^1.4.0",
+    "rollup-plugin-node-resolve": "^3.4.0"
+  },
+  "dependencies": {
+    "@applitools/functional-commons": "^1.0.19"
   }
 }

src/captureFrame.js

 /* global window, document */
-
-function captureFrame({styleProps, attributeProps, rectProps, ignoredTagNames}, doc = document) {
+'use strict';
+const captureFrameCss = require('./captureCss');
+const defaultDomProps = require('./defaultDomProps');
+async function captureFrame(
+  {styleProps, rectProps, ignoredTagNames} = defaultDomProps,
+  doc = document,
+) {
   const NODE_TYPES = {
@@ -17,7 +22,7 @@ ELEMENT: 1,
 
-  function iframeToJSON(el) {
-    const obj = elementToJSON(el);
+  async function iframeToJSON(el) {
+    const obj = await elementToJSON(el);
     try {
       if (el.contentDocument) {
-        obj.childNodes = [captureNode(el.contentDocument.documentElement)];
+        obj.childNodes = [await captureNode(el.contentDocument.documentElement)];
       }
@@ -30,3 +35,3 @@ } catch (ex) {
 
-  function elementToJSON(el) {
+  async function elementToJSON(el) {
     const tagName = el.tagName.toUpperCase();
@@ -43,15 +48,9 @@ if (ignoredTagNames.indexOf(tagName) > -1) return null;
 
-    const attributes = {};
-    if (attributeProps.all) {
-      for (const p of attributeProps.all) {
-        if (el.hasAttribute(p)) attributes[p] = el.getAttribute(p);
-      }
-    }
+    const attributes = Array.from(el.attributes)
+      .map(a => ({key: a.name, value: a.value}))
+      .reduce((obj, attr) => {
+        obj[attr.key] = attr.value;
+        return obj;
+      }, {});
 
-    if (attributeProps[tagName]) {
-      for (const p of attributeProps[tagName]) {
-        if (el.hasAttribute(p)) attributes[p] = el.getAttribute(p);
-      }
-    }
-
     return {
@@ -62,3 +61,5 @@ tagName,
       attributes: notEmptyObj(attributes),
-      childNodes: Array.prototype.map.call(el.childNodes, captureNode).filter(filter),
+      childNodes: (await Promise.all(Array.prototype.map.call(el.childNodes, captureNode))).filter(
+        filter,
+      ),
     };
@@ -74,3 +75,3 @@ }
 
-  function captureNode(node) {
+  async function captureNode(node) {
     switch (node.nodeType) {
@@ -81,5 +82,10 @@ case NODE_TYPES.TEXT:
         if (node.tagName.toUpperCase() === 'IFRAME') {
-          return iframeToJSON(node);
+          return await iframeToJSON(node);
         } else {
-          return elementToJSON(node);
+          const retVal = await elementToJSON(node);
+          if (node.tagName.toUpperCase() === 'HTML') {
+            const css = await captureFrameCss(window.location, node);
+            retVal.css = css;
+          }
+          return retVal;
         }
@@ -91,5 +97,5 @@ default:
 
-  return captureNode(doc.documentElement);
+  return await captureNode(doc.documentElement);
 }
 
-module.exports = captureFrame;
+module.exports = {captureFrame};

src/captureWindow.js

@@ -1,4 +0,4 @@
-const captureFrame = require('./captureFrame');
 const defaultDomProps = require('./defaultDomProps');
 const genXpath = require('./genXpath');
+const getCaptureDomScript = require('./captureDomExport');
 
@@ -44,3 +44,3 @@ async function captureWindow(runScript, domProps) {
   const args = JSON.stringify(mergedDomProps);
-  const scriptStr = `return (${captureFrame})(${args})`;
+  const scriptStr = `return (${await getCaptureDomScript()})(${args})`; //`return (${script})(${args})`;
 
@@ -47,0 +47,0 @@ return await doCaptureWindow();

src/defaultDomProps.js

@@ -23,9 +23,2 @@ // TODO conditionally add/remove properties based on value (need to account for cross browser values)
 
-const attributeProps = {
-  all: ['id', 'class'],
-  IMG: ['src'],
-  IFRAME: ['src'],
-  A: ['href'],
-};
-
 const ignoredTagNames = ['HEAD'];
@@ -36,4 +29,3 @@
   rectProps,
-  attributeProps,
   ignoredTagNames,
 };

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Major refactor

Supply chain risk

Package has recently undergone a major refactor. It may be unstable or indicate significant internal changes. Use caution when updating to versions that include significant changes.

Found 1 instance in 1 package

Network access

Supply chain risk

This module accesses the network.

Found 1 instance in 1 package

Uses eval

Supply chain risk

Package uses dynamic code execution (e.g., eval()), which is a dangerous practice. This can prevent the code from running in certain environments and increases the risk that the code may contain exploits or malicious behavior.

Found 1 instance in 1 package

Filesystem access

Supply chain risk

Accesses the file system, and could potentially read sensitive data.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Major refactor

Supply chain risk

Package has recently undergone a major refactor. It may be unstable or indicate significant internal changes. Use caution when updating to versions that include significant changes.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

16594

increased by192.77%

Number of package files

11

increased by57.14%

Lines of code

491

increased by199.39%

Worsened metrics

Dependency count

1

increased byInfinity%

Dev dependency count

14

increased by55.56%

Number of low supply chain risk alerts

2

increased by100%

Number of medium supply chain risk alerts

4

increased by300%

Dependency changes

• + Added@applitools/functional-commons@^1.0.19

• + Added@applitools/functional-commons@1.6.0(transitive)