lighthouse 9.3.1 → 9.4.0-dev.20220219

package/types/artifacts.d.ts

@@ -139,8 +139,8 @@ export interface GathererArtifacts extends PublicGathererArtifacts,LegacyBaseArt
   Fonts: Artifacts.Font[];
   /** Information on poorly sized font usage and the text affected by it. */
   FontSize: Artifacts.FontSize;
-  /** All the form elements in the page and formless inputs. */
-  FormElements: Artifacts.Form[];
+  /** All the input elements, including associated form and label elements. */
+  Inputs: {inputs: Artifacts.InputElement[]; forms: Artifacts.FormElement[]; labels: Artifacts.LabelElement[]};
   /** Screenshot of the entire page (rather than just the above the fold content). */
   FullPageScreenshot: Artifacts.FullPageScreenshot | null;
   /** Information about event listeners registered on the global object. */
@@ -787,22 +787,22 @@ declare module Artifacts {
     observedSpeedIndexTs: number;
   }
 
-  interface Form {
-    /** If attributes is missing that means this is a formless set of elements. */
-    attributes?: {
-      id: string;
-      name: string;
-      autocomplete: string;
-    };
-    node: NodeDetails | null;
-    inputs: Array<FormInput>;
-    labels: Array<FormLabel>;
+  interface FormElement {
+    id: string;
+    name: string;
+    autocomplete: string;
+    node: NodeDetails;
   }
 
   /** Attributes collected for every input element in the inputs array from the forms interface. */
-  interface FormInput {
+  interface InputElement {
+    /** If set, the parent form is the index into the associated FormElement array. Otherwise, the input element has no parent form. */
+    parentFormIndex?: number;
+    /** Array of indices into associated LabelElement array. */
+    labelIndices: number[];
     id: string;
     name: string;
+    type: string;
     placeholder?: string;
     autocomplete: {
       property: string;
@@ -813,7 +813,7 @@ declare module Artifacts {
   }
 
   /** Attributes collected for every label element in the labels array from the forms interface */
-  interface FormLabel {
+  interface LabelElement {
     for: string;
     node: NodeDetails;
   }

package/types/global-lh.d.ts

@@ -26,6 +26,7 @@ import Treemap_ from './lhr/treemap';
 declare global {
   module LH {
     export type ArbitraryEqualityMap = ArbitraryEqualityMap_;
+    export type NavigationRequestor = string | (() => Promise<void> | void);
 
     // artifacts.d.ts
     export import Artifacts = Artifacts_.Artifacts;

package/types/parse-cache-control/index.d.ts

@@ -12,6 +12,7 @@ declare module 'parse-cache-control' {
     'no-cache'?: boolean;
     'no-store'?: boolean;
     'private'?: boolean;
+    'stale-while-revalidate'?: boolean;
   }
 
   function ParseCacheControl(headers?: string): CacheHeaders | null;

package/types/smokehouse.d.ts

@@ -20,6 +20,9 @@ declare global {
         code?: any;
         message?: any;
       };
+      timing?: {
+        entries?: any
+      }
     }
 
     export type ExpectedRunnerResult = {

package/lighthouse-core/gather/gatherers/form-elements.js

@@ -1,113 +0,0 @@
-/**
- * @license Copyright 2020 The Lighthouse Authors. All Rights Reserved.
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
- */
-'use strict';
-
-/* global getNodeDetails */
-
-const FRGatherer = require('../../fraggle-rock/gather/base-gatherer.js');
-const pageFunctions = require('../../lib/page-functions.js');
-
-/* eslint-env browser, node */
-
-/**
- * @return {LH.Artifacts['FormElements']}
- */
-/* c8 ignore start */
-function collectFormElements() {
-  // @ts-expect-error - put into scope via stringification
-  const formChildren = getElementsInDocument('textarea, input, label, select'); // eslint-disable-line no-undef
-  /** @type {Map<HTMLFormElement|string, LH.Artifacts.Form>} */
-  const forms = new Map();
-  /** @type {LH.Artifacts.Form} */
-  const formlessObj = {
-    node: null,
-    inputs: [],
-    labels: [],
-  };
-  for (const child of formChildren) {
-    const isButton = child instanceof HTMLInputElement &&
-      (child.type === 'submit' || child.type === 'button');
-    if (isButton) continue;
-
-    const parentFormElement = child.form;
-    const hasForm = !!parentFormElement;
-    if (hasForm && !forms.has(parentFormElement)) {
-      const newFormObj = {
-        attributes: {
-          id: parentFormElement.id,
-          name: parentFormElement.name,
-          autocomplete: parentFormElement.autocomplete,
-        },
-        // @ts-expect-error - getNodeDetails put into scope via stringification
-        node: getNodeDetails(parentFormElement),
-        inputs: [],
-        labels: [],
-      };
-      forms.set(parentFormElement, newFormObj);
-    }
-    const formObj = forms.get(parentFormElement) || formlessObj;
-    if (child instanceof HTMLInputElement || child instanceof HTMLTextAreaElement ||
-      child instanceof HTMLSelectElement) {
-      formObj.inputs.push({
-        id: child.id,
-        name: child.name,
-        placeholder: child instanceof HTMLSelectElement ? undefined : child.placeholder,
-        autocomplete: {
-          property: child.autocomplete,
-          // Requires `--enable-features=AutofillShowTypePredictions`.
-          attribute: child.getAttribute('autocomplete'),
-          prediction: child.getAttribute('autofill-prediction'),
-        },
-        // @ts-expect-error - getNodeDetails put into scope via stringification
-        node: getNodeDetails(child),
-      });
-    }
-    if (child instanceof HTMLLabelElement) {
-      formObj.labels.push({
-        for: child.htmlFor,
-        // @ts-expect-error - getNodeDetails put into scope via stringification
-        node: getNodeDetails(child),
-      });
-    }
-  }
-
-  if (formlessObj.inputs.length > 0 || formlessObj.labels.length > 0) {
-    forms.set('formless', {
-      node: formlessObj.node,
-      inputs: formlessObj.inputs,
-      labels: formlessObj.labels,
-    });
-  }
-  return [...forms.values()];
-}
-/* c8 ignore stop */
-
-class FormElements extends FRGatherer {
-  /** @type {LH.Gatherer.GathererMeta} */
-  meta = {
-    supportedModes: ['snapshot', 'navigation'],
-  };
-
-  /**
-   * @param {LH.Gatherer.FRTransitionalContext} passContext
-   * @return {Promise<LH.Artifacts['FormElements']>}
-   */
-  async getArtifact(passContext) {
-    const driver = passContext.driver;
-
-    const formElements = await driver.executionContext.evaluate(collectFormElements, {
-      args: [],
-      useIsolation: true,
-      deps: [
-        pageFunctions.getElementsInDocumentString,
-        pageFunctions.getNodeDetailsString,
-      ],
-    });
-    return formElements;
-  }
-}
-
-module.exports = FormElements;