changing getNodeInfo to getNodeDetails

GoogleChrome · Sep 14, 2020 · cda6169 · cda6169
1 parent f18bb19
commit cda6169
Show file tree

Hide file tree

Showing 11 changed files with 48 additions and 51 deletions.
diff --git a/lighthouse-core/gather/gatherers/accessibility.js b/lighthouse-core/gather/gatherers/accessibility.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-/* global window, document, getNodeInfo */
+/* global window, document, getNodeDetails */
 
 const Gatherer = require('./gatherer.js');
 const fs = require('fs');
@@ -61,8 +61,8 @@ function runA11yChecks() {
       // @ts-expect-error
 
       result.nodes.forEach(node => {
-        // @ts-expect-error - getNodeInfo put into scope via stringification
-        Object.assign(node, getNodeInfo(node.element));
+        // @ts-expect-error - getNodeDetails put into scope via stringification
+        Object.assign(node, getNodeDetails(node.element));
         // avoid circular JSON concerns
         node.element = node.any = node.all = node.none = undefined;
       });
@@ -101,7 +101,7 @@ class Accessibility extends Gatherer {
   afterPass(passContext) {
     const driver = passContext.driver;
     const expression = `(function () {
-      ${pageFunctions.getNodeInfoString};
+      ${pageFunctions.getNodeDetailsString};
       ${axeLibSource};
       return (${runA11yChecks.toString()}());
     })()`;

diff --git a/lighthouse-core/gather/gatherers/anchor-elements.js b/lighthouse-core/gather/gatherers/anchor-elements.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-/* global getNodeInfo */
+/* global getNodeDetails */
 
 const Gatherer = require('./gatherer.js');
 const pageFunctions = require('../../lib/page-functions.js');
@@ -43,8 +43,8 @@ function collectAnchorElements() {
   const anchorElements = getElementsInDocument('a'); // eslint-disable-line no-undef
 
   return anchorElements.map(node => {
-    // @ts-expect-error - getNodeInfo put into scope via stringification
-    const nodeInfo = getNodeInfo(node);
+    // @ts-expect-error - getNodeDetails put into scope via stringification
+    const nodeInfo = getNodeDetails(node);
     if (node instanceof HTMLAnchorElement) {
       return {
         href: node.href,
@@ -97,7 +97,7 @@ class AnchorElements extends Gatherer {
     const driver = passContext.driver;
     const expression = `(() => {
       ${pageFunctions.getElementsInDocumentString};
-      ${pageFunctions.getNodeInfoString};
+      ${pageFunctions.getNodeDetailsString};
 
       return (${collectAnchorElements})();
     })()`;

diff --git a/lighthouse-core/gather/gatherers/dobetterweb/password-inputs-with-prevented-paste.js b/lighthouse-core/gather/gatherers/dobetterweb/password-inputs-with-prevented-paste.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-/* global document ClipboardEvent getNodeInfo */
+/* global document ClipboardEvent getNodeDetails */
 
 const Gatherer = require('../gatherer.js');
 const pageFunctions = require('../../../lib/page-functions.js');
@@ -23,8 +23,8 @@ function findPasswordInputsWithPreventedPaste() {
       )
     )
     .map(passwordInput => ({
-      // @ts-expect-error - getNodeInfo put into scope via stringification
-      ...getNodeInfo(passwordInput),
+      // @ts-expect-error - getNodeDetails put into scope via stringification
+      ...getNodeDetails(passwordInput),
     }));
 }
 
@@ -35,7 +35,7 @@ class PasswordInputsWithPreventedPaste extends Gatherer {
    */
   afterPass(passContext) {
     const expression = `(() => {
-      ${pageFunctions.getNodeInfoString};
+      ${pageFunctions.getNodeDetailsString};
       return (${findPasswordInputsWithPreventedPaste.toString()}());
     })()`;
 

diff --git a/lighthouse-core/gather/gatherers/form-elements.js b/lighthouse-core/gather/gatherers/form-elements.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-/* global getNodeInfo */
+/* global getNodeDetails */
 
 const Gatherer = require('./gatherer.js');
 const pageFunctions = require('../../lib/page-functions.js');
@@ -39,8 +39,8 @@ function collectFormElements() {
           id: parentFormElement.id,
           name: parentFormElement.name,
           autocomplete: parentFormElement.autocomplete,
-          // @ts-expect-error - getNodeInfo put into scope via stringification
-          ...getNodeInfo(parentFormElement),
+          // @ts-expect-error - getNodeDetails put into scope via stringification
+          ...getNodeDetails(parentFormElement),
         },
         inputs: [],
         labels: [],
@@ -60,15 +60,15 @@ function collectFormElements() {
           attribute: child.getAttribute('autocomplete'),
           prediction: child.getAttribute('autofill-prediction'),
         },
-        // @ts-expect-error - getNodeInfo put into scope via stringification
-        ...getNodeInfo(child),
+        // @ts-expect-error - getNodeDetails put into scope via stringification
+        ...getNodeDetails(child),
       });
     }
     if (child instanceof HTMLLabelElement) {
       formObj.labels.push({
         for: child.htmlFor,
-        // @ts-expect-error - getNodeInfo put into scope via stringification
-        ...getNodeInfo(child),
+        // @ts-expect-error - getNodeDetails put into scope via stringification
+        ...getNodeDetails(child),
       });
     }
   }
@@ -92,7 +92,7 @@ class FormElements extends Gatherer {
 
     const expression = `(() => {
       ${pageFunctions.getElementsInDocumentString};
-      ${pageFunctions.getNodeInfoString};
+      ${pageFunctions.getNodeDetailsString};
       return (${collectFormElements})();
     })()`;
 

diff --git a/lighthouse-core/gather/gatherers/iframe-elements.js b/lighthouse-core/gather/gatherers/iframe-elements.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-/* global getNodeInfo */
+/* global getNodeDetails */
 
 const Gatherer = require('./gatherer.js');
 const pageFunctions = require('../../lib/page-functions.js');
@@ -28,8 +28,8 @@ function collectIFrameElements() {
       clientRect: {top, bottom, left, right, width, height},
       // @ts-expect-error - put into scope via stringification
       isPositionFixed: isPositionFixed(node), // eslint-disable-line no-undef
-      // @ts-expect-error - getNodeInfo put into scope via stringification
-      ...getNodeInfo(node),
+      // @ts-expect-error - getNodeDetails put into scope via stringification
+      ...getNodeDetails(node),
     };
   });
 }
@@ -46,7 +46,7 @@ class IFrameElements extends Gatherer {
     const expression = `(() => {
       ${pageFunctions.getElementsInDocumentString};
       ${pageFunctions.isPositionFixedString};
-      ${pageFunctions.getNodeInfoString};
+      ${pageFunctions.getNodeDetailsString};
       return (${collectIFrameElements})();
     })()`;
 

diff --git a/lighthouse-core/gather/gatherers/image-elements.js b/lighthouse-core/gather/gatherers/image-elements.js
@@ -14,7 +14,7 @@ const pageFunctions = require('../../lib/page-functions.js');
 const Driver = require('../driver.js'); // eslint-disable-line no-unused-vars
 const FontSize = require('./seo/font-size.js');
 
-/* global window, getElementsInDocument, Image, getNodeInfo, ShadowRoot */
+/* global window, getElementsInDocument, Image, getNodeDetails, ShadowRoot */
 
 
 /** @param {Element} element */
@@ -86,8 +86,8 @@ function getHTMLImages(allElements) {
       isInShadowDOM: element.getRootNode() instanceof ShadowRoot,
       // https://html.spec.whatwg.org/multipage/images.html#pixel-density-descriptor
       usesSrcSetDensityDescriptor: / \d+(\.\d+)?x/.test(element.srcset),
-      // @ts-expect-error - getNodeInfo put into scope via stringification
-      ...getNodeInfo(element),
+      // @ts-expect-error - getNodeDetails put into scope via stringification
+      ...getNodeDetails(element),
     };
   });
 }
@@ -137,8 +137,8 @@ function getCSSImages(allElements) {
       ),
       usesSrcSetDensityDescriptor: false,
       resourceSize: 0, // this will get overwritten below
-      // @ts-expect-error - getNodeInfo put into scope via stringification
-      ...getNodeInfo(element),
+      // @ts-expect-error - getNodeDetails put into scope via stringification
+      ...getNodeDetails(element),
     });
   }
 
@@ -301,7 +301,7 @@ class ImageElements extends Gatherer {
     const expression = `(function() {
       ${pageFunctions.getElementsInDocumentString}; // define function on page
       ${pageFunctions.getBoundingClientRectString};
-      ${pageFunctions.getNodeInfoString};
+      ${pageFunctions.getNodeDetailsString};
       ${getClientRect.toString()};
       ${getPosition.toString()};
       ${getHTMLImages.toString()};

diff --git a/lighthouse-core/gather/gatherers/link-elements.js b/lighthouse-core/gather/gatherers/link-elements.js
@@ -9,12 +9,9 @@ const LinkHeader = require('http-link-header');
 const Gatherer = require('./gatherer.js');
 const {URL} = require('../../lib/url-shim.js');
 const NetworkAnalyzer = require('../../lib/dependency-graph/simulator/network-analyzer.js');
-const {
-  getElementsInDocumentString,
-  getNodeInfoString,
-} = require('../../lib/page-functions.js');
+const {getElementsInDocumentString, getNodeDetailsString} = require('../../lib/page-functions.js');
 
-/* globals HTMLLinkElement getNodeInfo */
+/* globals HTMLLinkElement getNodeDetails */
 
 /**
  * @fileoverview
@@ -74,7 +71,7 @@ function getLinkElementsInDOM() {
       hrefRaw,
       source,
       // @ts-expect-error - put into scope via stringification
-      ...getNodeInfo(link),
+      ...getNodeDetails(link),
     });
   }
 
@@ -92,7 +89,7 @@ class LinkElements extends Gatherer {
     return passContext.driver.evaluateAsync(`(() => {
       ${getElementsInDocumentString};
       ${getLinkElementsInDOM};
-      ${getNodeInfoString};
+      ${getNodeDetailsString};
 
       return getLinkElementsInDOM();
     })()`, {useIsolation: true});

diff --git a/lighthouse-core/gather/gatherers/script-elements.js b/lighthouse-core/gather/gatherers/script-elements.js
@@ -11,7 +11,7 @@ const NetworkRequest = require('../../lib/network-request.js');
 const getElementsInDocumentString = require('../../lib/page-functions.js').getElementsInDocumentString; // eslint-disable-line max-len
 const pageFunctions = require('../../lib/page-functions.js');
 
-/* global getNodeInfo */
+/* global getNodeDetails */
 
 /**
  * @return {LH.Artifacts['ScriptElements']}
@@ -30,8 +30,8 @@ function collectAllScriptElements() {
       async: script.async,
       defer: script.defer,
       source: /** @type {'head'|'body'} */ (script.closest('head') ? 'head' : 'body'),
-      // @ts-expect-error - getNodeInfo put into scope via stringification
-      ...getNodeInfo(script),
+      // @ts-expect-error - getNodeDetails put into scope via stringification
+      ...getNodeDetails(script),
       content: script.src ? null : script.text,
       requestId: null,
     };
@@ -75,7 +75,7 @@ class ScriptElements extends Gatherer {
     /** @type {LH.Artifacts['ScriptElements']} */
     const scripts = await driver.evaluateAsync(`(() => {
       ${getElementsInDocumentString}
-      ${pageFunctions.getNodeInfoString};
+      ${pageFunctions.getNodeDetailsString};
       return (${collectAllScriptElements.toString()})();
     })()`, {useIsolation: true});
 

diff --git a/lighthouse-core/gather/gatherers/seo/tap-targets.js b/lighthouse-core/gather/gatherers/seo/tap-targets.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-/* global document, window, getComputedStyle, getElementsInDocument, Node, getNodeInfo */
+/* global document, window, getComputedStyle, getElementsInDocument, Node, getNodeDetails */
 
 const Gatherer = require('../gatherer.js');
 const pageFunctions = require('../../../lib/page-functions.js');
@@ -271,8 +271,8 @@ function gatherTapTargets() {
     targets.push({
       clientRects: visibleClientRects,
       href: /** @type {HTMLAnchorElement} */(tapTargetElement)['href'] || '',
-      // @ts-expect-error - getNodeInfo put into scope via stringification
-      ...getNodeInfo(tapTargetElement),
+      // @ts-expect-error - getNodeDetails put into scope via stringification
+      ...getNodeDetails(tapTargetElement),
     });
   }
 
@@ -301,7 +301,7 @@ class TapTargets extends Gatherer {
       ${getLargestRect.toString()};
       ${getRectCenterPoint.toString()};
       ${rectContains.toString()};
-      ${pageFunctions.getNodeInfoString};
+      ${pageFunctions.getNodeDetailsString};
       ${gatherTapTargets.toString()};
 
       return gatherTapTargets();

diff --git a/lighthouse-core/gather/gatherers/trace-elements.js b/lighthouse-core/gather/gatherers/trace-elements.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-/* global getNodeInfo */
+/* global getNodeDetails */
 
 /**
  * @fileoverview
@@ -30,8 +30,8 @@ function getNodeDetailsData() {
   let traceElement;
   if (elem) {
     traceElement = {
-      // @ts-expect-error - getNodeInfo put into scope via stringification
-      ...getNodeInfo(elem),
+      // @ts-expect-error - getNodeDetails put into scope via stringification
+      ...getNodeDetails(elem),
     };
   }
   return traceElement;
@@ -282,7 +282,7 @@ class TraceElements extends Gatherer {
             objectId,
             functionDeclaration: `function () {
               ${getNodeDetailsData.toString()};
-              ${pageFunctions.getNodeInfoString};
+              ${pageFunctions.getNodeDetailsString};
               return getNodeDetailsData.call(this);
             }`,
             returnByValue: true,

diff --git a/lighthouse-core/lib/page-functions.js b/lighthouse-core/lib/page-functions.js
@@ -420,7 +420,7 @@ function wrapRequestIdleCallback(cpuSlowdownMultiplier) {
   };
 }
 
-const getNodeInfoString = `function getNodeInfo(elem) {
+const getNodeDetailsString = `function getNodeDetails(elem) {
   ${getNodePath.toString()};
   ${getNodeSelector.toString()};
   ${getBoundingClientRect.toString()};
@@ -444,7 +444,7 @@ module.exports = {
   getOuterHTMLSnippet: getOuterHTMLSnippet,
   computeBenchmarkIndex: computeBenchmarkIndex,
   computeBenchmarkIndexString: computeBenchmarkIndex.toString(),
-  getNodeInfoString,
+  getNodeDetailsString,
   getNodePathString: getNodePath.toString(),
   getNodeSelectorString: getNodeSelector.toString(),
   getNodeSelector: getNodeSelector,