chrome-devtools-frontend 1.0.1402249 → 1.0.1418433

package/front_end/models/trace/lantern/core/NetworkAnalyzer.test.ts

@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// @ts-nocheck TODO(crbug.com/348449529)
-
 import {TraceLoader} from '../../../../testing/TraceLoader.js';
 import * as Trace from '../../trace.js';
 import * as Lantern from '../lantern.js';
@@ -24,9 +22,22 @@ describe('NetworkAnalyzer', () => {
     traceWithRedirect = toLanternTrace(await TraceLoader.rawEvents(this, 'lantern/redirect/trace.json.gz'));
   });
 
-  let recordId;
-
-  function createRecord(opts) {
+  let recordId = 1;
+
+  function createRecord(opts: {
+    // Real request ids are strings but we take a number here to make test
+    // setup easier.
+    requestId?: number,
+    connectionId?: number,
+    connectionReused?: boolean,
+    url?: string,
+    networkRequestTime?: number,
+    networkEndTime?: number,
+    protocol?: string,
+    transferSize?: number,
+    resourceType?: string,
+    timing?: {connectStart?: number, connectEnd?: number, sendStart?: number, receiveHeadersEnd?: number},
+  }): Trace.Lantern.Types.NetworkRequest {
     const url = opts.url || 'https://example.com';
     if (opts.networkRequestTime) {
       opts.networkRequestTime *= 1000;
@@ -34,28 +45,31 @@ describe('NetworkAnalyzer', () => {
     if (opts.networkEndTime) {
       opts.networkEndTime *= 1000;
     }
+    const requestId = opts.requestId ? String(opts.requestId) : String(recordId++);
+    delete opts.requestId;
+
     return Object.assign(
-        {
-          url,
-          requestId: recordId++,
-          connectionId: 0,
-          connectionReused: false,
-          networkRequestTime: 10,
-          networkEndTime: 10,
-          transferSize: 10000,
-          protocol: opts.protocol || 'http/1.1',
-          parsedURL: {scheme: url.match(/https?/)[0], securityOrigin: url.match(/.*\.com/)[0]},
-          timing: opts.timing || null,
-        },
-        opts,
-    );
+               {
+                 url,
+                 requestId,
+                 connectionId: 0,
+                 connectionReused: false,
+                 networkRequestTime: 10,
+                 networkEndTime: 10,
+                 transferSize: 10000,
+                 protocol: opts.protocol || 'http/1.1',
+                 parsedURL: {scheme: url.match(/https?/)?.[0], securityOrigin: url.match(/.*\.com/)?.[0]},
+                 timing: opts.timing || null,
+               },
+               opts,
+               ) as unknown as Trace.Lantern.Types.NetworkRequest;
   }
 
   beforeEach(() => {
     recordId = 1;
   });
 
-  function assertCloseEnough(valueA, valueB, threshold = 1) {
+  function assertCloseEnough(valueA: number, valueB: number, threshold = 1) {
     const message = `${valueA} was not close enough to ${valueB}`;
     assert.isOk(Math.abs(valueA - valueB) < threshold, message);
   }
@@ -63,15 +77,17 @@ describe('NetworkAnalyzer', () => {
   describe('#estimateIfConnectionWasReused', () => {
     it('should use built-in value when trustworthy', () => {
       const records = [
-        {requestId: 1, connectionId: 1, connectionReused: false},
-        {requestId: 2, connectionId: 1, connectionReused: true},
-        {requestId: 3, connectionId: 2, connectionReused: false},
-        {requestId: 4, connectionId: 3, connectionReused: false},
-        {requestId: 5, connectionId: 2, connectionReused: true},
+        createRecord({requestId: 1, connectionId: 1, connectionReused: false}),
+        createRecord({requestId: 2, connectionId: 1, connectionReused: true}),
+        createRecord({requestId: 3, connectionId: 2, connectionReused: false}),
+        createRecord({requestId: 4, connectionId: 3, connectionReused: false}),
+        createRecord({requestId: 5, connectionId: 2, connectionReused: true}),
       ];
 
-      const result = NetworkAnalyzer.estimateIfConnectionWasReused(records);
-      const expected = new Map([[1, false], [2, true], [3, false], [4, false], [5, true]]);
+      // the `records` are not "full" NetworkRequest items but they are good enough for this test.
+      const result =
+          NetworkAnalyzer.estimateIfConnectionWasReused(records as unknown as Trace.Lantern.Types.NetworkRequest[]);
+      const expected = new Map([['1', false], ['2', true], ['3', false], ['4', false], ['5', true]]);
       assert.deepEqual(result, expected);
     });
 
@@ -83,8 +99,9 @@ describe('NetworkAnalyzer', () => {
         createRecord({requestId: 4, networkRequestTime: 30, networkEndTime: 40}),
       ];
 
-      const result = NetworkAnalyzer.estimateIfConnectionWasReused(records);
-      const expected = new Map([[1, false], [2, false], [3, true], [4, true]]);
+      const result =
+          NetworkAnalyzer.estimateIfConnectionWasReused(records as unknown as Trace.Lantern.Types.NetworkRequest[]);
+      const expected = new Map([['1', false], ['2', false], ['3', true], ['4', true]]);
       assert.deepEqual(result, expected);
     });
 
@@ -120,8 +137,9 @@ describe('NetworkAnalyzer', () => {
         }),
       ];
 
-      const result = NetworkAnalyzer.estimateIfConnectionWasReused(records);
-      const expected = new Map([[1, false], [2, false], [3, true], [4, true]]);
+      const result =
+          NetworkAnalyzer.estimateIfConnectionWasReused(records as unknown as Trace.Lantern.Types.NetworkRequest[]);
+      const expected = new Map([['1', false], ['2', false], ['3', true], ['4', true]]);
       assert.deepEqual(result, expected);
     });
 
@@ -133,8 +151,9 @@ describe('NetworkAnalyzer', () => {
         createRecord({requestId: 4, networkRequestTime: 35, networkEndTime: 40}),
       ];
 
-      const result = NetworkAnalyzer.estimateIfConnectionWasReused(records);
-      const expected = new Map([[1, false], [2, false], [3, true], [4, true]]);
+      const result =
+          NetworkAnalyzer.estimateIfConnectionWasReused(records as unknown as Trace.Lantern.Types.NetworkRequest[]);
+      const expected = new Map([['1', false], ['2', false], ['3', true], ['4', true]]);
       assert.deepEqual(result, expected);
     });
 
@@ -250,9 +269,9 @@ describe('NetworkAnalyzer', () => {
     it('should work on a real trace', async () => {
       const requests = await createRequests(trace);
       const result = NetworkAnalyzer.estimateRTTByOrigin(requests);
-      assertCloseEnough(result.get('https://www.paulirish.com').min, 10);
-      assertCloseEnough(result.get('https://www.googletagmanager.com').min, 17);
-      assertCloseEnough(result.get('https://www.google-analytics.com').min, 10);
+      assertCloseEnough(result.get('https://www.paulirish.com')?.min ?? 0, 10);
+      assertCloseEnough(result.get('https://www.googletagmanager.com')?.min ?? 0, 17);
+      assertCloseEnough(result.get('https://www.google-analytics.com')?.min ?? 0, 10);
     });
 
     it('should approximate well with either method', async () => {
@@ -263,6 +282,8 @@ describe('NetworkAnalyzer', () => {
                                  forceCoarseEstimates: true,
                                })
                                .get(NetworkAnalyzer.summary);
+      assert.isOk(result);
+      assert.isOk(resultApprox);
       assertCloseEnough(result.min, resultApprox.min, 20);
       assertCloseEnough(result.avg, resultApprox.avg, 30);
       assertCloseEnough(result.median, resultApprox.median, 30);
@@ -299,9 +320,9 @@ describe('NetworkAnalyzer', () => {
     it('should work on a real trace', async () => {
       const requests = await createRequests(trace);
       const result = NetworkAnalyzer.estimateServerResponseTimeByOrigin(requests);
-      assertCloseEnough(result.get('https://www.paulirish.com').avg, 35);
-      assertCloseEnough(result.get('https://www.googletagmanager.com').avg, 8);
-      assertCloseEnough(result.get('https://www.google-analytics.com').avg, 8);
+      assertCloseEnough(result.get('https://www.paulirish.com')?.avg ?? 0, 35);
+      assertCloseEnough(result.get('https://www.googletagmanager.com')?.avg ?? 0, 8);
+      assertCloseEnough(result.get('https://www.google-analytics.com')?.avg ?? 0, 8);
     });
 
     it('should approximate well with either method', async () => {
@@ -314,6 +335,8 @@ describe('NetworkAnalyzer', () => {
                                  forceCoarseEstimates: true,
                                })
                                .get(NetworkAnalyzer.summary);
+      assert.isOk(result);
+      assert.isOk(resultApprox);
       assertCloseEnough(result.min, resultApprox.min, 20);
       assertCloseEnough(result.avg, resultApprox.avg, 30);
       assertCloseEnough(result.median, resultApprox.median, 30);
@@ -323,20 +346,21 @@ describe('NetworkAnalyzer', () => {
   describe('#estimateThroughput', () => {
     const estimateThroughput = NetworkAnalyzer.estimateThroughput;
 
-    function createThroughputRecord(responseHeadersEndTimeInS, networkEndTimeInS, extras) {
+    function createThroughputRecord(responseHeadersEndTimeInS: number, networkEndTimeInS: number, extras: object = {}):
+        Trace.Lantern.Types.NetworkRequest {
       return Object.assign(
-          {
-            responseHeadersEndTime: responseHeadersEndTimeInS * 1000,
-            networkEndTime: networkEndTimeInS * 1000,
-            transferSize: 1000,
-            finished: true,
-            failed: false,
-            statusCode: 200,
-            url: 'https://google.com/logo.png',
-            parsedURL: {scheme: 'https'},
-          },
-          extras,
-      );
+                 {
+                   responseHeadersEndTime: responseHeadersEndTimeInS * 1000,
+                   networkEndTime: networkEndTimeInS * 1000,
+                   transferSize: 1000,
+                   finished: true,
+                   failed: false,
+                   statusCode: 200,
+                   url: 'https://google.com/logo.png',
+                   parsedURL: {scheme: 'https'},
+                 },
+                 extras,
+                 ) as unknown as Trace.Lantern.Types.NetworkRequest;
     }
 
     it('should return null for no/missing records', () => {
@@ -468,12 +492,14 @@ describe('NetworkAnalyzer', () => {
     it('should find the main document', async () => {
       const requests = await createRequests(trace);
       const mainDocument = NetworkAnalyzer.findResourceForUrl(requests, 'https://www.paulirish.com/');
+      assert.isOk(mainDocument);
       assert.strictEqual(mainDocument.url, 'https://www.paulirish.com/');
     });
 
     it('should find the main document if the URL includes a fragment', async () => {
       const requests = await createRequests(trace);
       const mainDocument = NetworkAnalyzer.findResourceForUrl(requests, 'https://www.paulirish.com/#info');
+      assert.isOk(mainDocument);
       assert.strictEqual(mainDocument.url, 'https://www.paulirish.com/');
     });
   });
@@ -482,6 +508,7 @@ describe('NetworkAnalyzer', () => {
     it('should resolve to the same document when no redirect', async () => {
       const requests = await createRequests(trace);
       const mainDocument = NetworkAnalyzer.findResourceForUrl(requests, 'https://www.paulirish.com/');
+      assert.isOk(mainDocument);
       const finalDocument = NetworkAnalyzer.resolveRedirects(mainDocument);
       assert.strictEqual(mainDocument.url, finalDocument.url);
       assert.strictEqual(finalDocument.url, 'https://www.paulirish.com/');
@@ -490,6 +517,7 @@ describe('NetworkAnalyzer', () => {
     it('should resolve to the final document with redirects', async () => {
       const requests = await createRequests(traceWithRedirect);
       const mainDocument = NetworkAnalyzer.findResourceForUrl(requests, 'http://www.vkontakte.ru/');
+      assert.isOk(mainDocument);
       const finalDocument = NetworkAnalyzer.resolveRedirects(mainDocument);
       assert.notEqual(mainDocument.url, finalDocument.url);
       assert.strictEqual(finalDocument.url, 'https://m.vk.com/');

package/front_end/models/trace/lantern/core/NetworkAnalyzer.ts

@@ -37,7 +37,7 @@ class UrlUtils {
       urlb.hash = '';
 
       return urla.href === urlb.href;
-    } catch (e) {
+    } catch {
       return false;
     }
   }
@@ -70,11 +70,11 @@ interface RTTEstimateOptions {
   useHeadersEndEstimates?: boolean;
 }
 
-type RequestInfo = {
-  request: Lantern.NetworkRequest,
-  timing: Lantern.ResourceTiming,
-  connectionReused?: boolean,
-};
+interface RequestInfo {
+  request: Lantern.NetworkRequest;
+  timing: Lantern.ResourceTiming;
+  connectionReused?: boolean;
+}
 
 const INITIAL_CWD = 14 * 1024;
 
@@ -408,7 +408,6 @@ class NetworkAnalyzer {
     for (const [origin, originRequests] of groupedByOrigin.entries()) {
       const originEstimates: number[] = [];
 
-      // eslint-disable-next-line no-inner-declarations
       function collectEstimates(estimator: (e: RequestInfo) => number[] | number | undefined, multiplier = 1): void {
         for (const request of originRequests) {
           const timing = request.timing;

package/front_end/models/trace/lantern/graph/BaseNode.test.ts

@@ -2,16 +2,23 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// @ts-nocheck TODO(crbug.com/348449529)
-
 import * as Lantern from '../lantern.js';
 
 const {BaseNode, NetworkNode} = Lantern.Graph;
 
-function sortedById(nodeArray: Lantern.Node[]) {
+function sortedById(nodeArray: Lantern.Graph.Node[]) {
   return nodeArray.sort((node1, node2) => node1.id.localeCompare(node2.id));
 }
 
+/**
+ * In the real implementation we pass around Node<T>, which are either CPUNodes
+ * or NetworkNodes. Rather than construct those for these tests, which don't
+ * need real nodes, we instead create BaseNodes and cast them to satisfy TS.
+ */
+function makeFakeNode(name: string): Lantern.Graph.Node {
+  return new BaseNode(name) as Lantern.Graph.Node;
+}
+
 function createComplexGraph() {
   //   B       F
   //  / \     /
@@ -19,14 +26,14 @@ function createComplexGraph() {
   //  \ /     \
   //   C       G - H
 
-  const nodeA = new BaseNode('A');
-  const nodeB = new BaseNode('B');
-  const nodeC = new BaseNode('C');
-  const nodeD = new BaseNode('D');
-  const nodeE = new BaseNode('E');
-  const nodeF = new BaseNode('F');
-  const nodeG = new BaseNode('G');
-  const nodeH = new BaseNode('H');
+  const nodeA = makeFakeNode('A');
+  const nodeB = makeFakeNode('B');
+  const nodeC = makeFakeNode('C');
+  const nodeD = makeFakeNode('D');
+  const nodeE = makeFakeNode('E');
+  const nodeF = makeFakeNode('F');
+  const nodeG = makeFakeNode('G');
+  const nodeH = makeFakeNode('H');
 
   nodeA.addDependent(nodeB);
   nodeA.addDependent(nodeC);
@@ -52,15 +59,15 @@ function createComplexGraph() {
 describe('BaseNode', () => {
   describe('#constructor', () => {
     it('should set the ID', () => {
-      const node = new BaseNode('foo');
+      const node = makeFakeNode('foo');
       assert.strictEqual(node.id, 'foo');
     });
   });
 
   describe('.addDependent', () => {
     it('should add the correct edge', () => {
-      const nodeA = new BaseNode('1');
-      const nodeB = new BaseNode('2');
+      const nodeA = makeFakeNode('1');
+      const nodeB = makeFakeNode('2');
       nodeA.addDependent(nodeB);
 
       assert.deepEqual(nodeA.getDependents(), [nodeB]);
@@ -70,8 +77,8 @@ describe('BaseNode', () => {
 
   describe('.addDependency', () => {
     it('should add the correct edge', () => {
-      const nodeA = new BaseNode('1');
-      const nodeB = new BaseNode('2');
+      const nodeA = makeFakeNode('1');
+      const nodeB = makeFakeNode('2');
       nodeA.addDependency(nodeB);
 
       assert.deepEqual(nodeA.getDependencies(), [nodeB]);
@@ -79,7 +86,7 @@ describe('BaseNode', () => {
     });
 
     it('throw when trying to add a dependency on itself', () => {
-      const nodeA = new BaseNode('1');
+      const nodeA = makeFakeNode('1');
       expect(() => nodeA.addDependency(nodeA)).to.throw();
     });
   });
@@ -121,8 +128,8 @@ describe('BaseNode', () => {
 
   describe('.cloneWithoutRelationships', () => {
     it('should create a copy', () => {
-      const node = new BaseNode('1');
-      const neighbor = new BaseNode('2');
+      const node = makeFakeNode('1');
+      const neighbor = makeFakeNode('2');
       node.addDependency(neighbor);
       const clone = node.cloneWithoutRelationships();
 
@@ -132,9 +139,9 @@ describe('BaseNode', () => {
     });
 
     it('should copy isMainDocument', () => {
-      const node = new BaseNode('1');
+      const node = makeFakeNode('1');
       node.setIsMainDocument(true);
-      const networkNode = new NetworkNode({});
+      const networkNode = new NetworkNode({} as Lantern.Types.NetworkRequest);
       networkNode.setIsMainDocument(true);
 
       assert.isOk(node.cloneWithoutRelationships().isMainDocument());
@@ -144,8 +151,8 @@ describe('BaseNode', () => {
 
   describe('.cloneWithRelationships', () => {
     it('should create a copy of a basic graph', () => {
-      const node = new BaseNode('1');
-      const neighbor = new BaseNode('2');
+      const node = makeFakeNode('1');
+      const neighbor = makeFakeNode('2');
       node.addDependency(neighbor);
       const clone = node.cloneWithRelationships();
 
@@ -188,12 +195,12 @@ describe('BaseNode', () => {
       //   C - D - E - F
       //  /             \
       // A - - - - - - - B
-      const nodeA = new BaseNode('A');
-      const nodeB = new BaseNode('B');
-      const nodeC = new BaseNode('C');
-      const nodeD = new BaseNode('D');
-      const nodeE = new BaseNode('E');
-      const nodeF = new BaseNode('F');
+      const nodeA = makeFakeNode('A');
+      const nodeB = makeFakeNode('B');
+      const nodeC = makeFakeNode('C');
+      const nodeD = makeFakeNode('D');
+      const nodeE = makeFakeNode('E');
+      const nodeF = makeFakeNode('F');
 
       nodeA.addDependent(nodeB);
       nodeF.addDependent(nodeB);
@@ -238,7 +245,7 @@ describe('BaseNode', () => {
       const graph = createComplexGraph();
       assert.throws(
           // clone from root to nodeB, but called on nodeD
-          _ => graph.nodeD.cloneWithRelationships(node => node.id === 'B'),
+          () => graph.nodeD.cloneWithRelationships(node => node.id === 'B'),
           /^Cloned graph missing node$/,
       );
     });
@@ -247,7 +254,7 @@ describe('BaseNode', () => {
   describe('.traverse', () => {
     it('should visit every dependent node', () => {
       const graph = createComplexGraph();
-      const ids = [];
+      const ids: string[] = [];
       graph.nodeA.traverse(node => ids.push(node.id));
 
       assert.deepEqual(ids, ['A', 'B', 'C', 'D', 'E', 'F', 'G', 'H']);
@@ -255,7 +262,7 @@ describe('BaseNode', () => {
 
     it('should include a shortest traversal path to every dependent node', () => {
       const graph = createComplexGraph();
-      const paths = [];
+      const paths: string[][] = [];
       graph.nodeA.traverse((node, traversalPath) => {
         assert.strictEqual(node.id, traversalPath[0].id);
         paths.push(traversalPath.map(node => node.id));
@@ -275,7 +282,7 @@ describe('BaseNode', () => {
 
     it('should respect getNext', () => {
       const graph = createComplexGraph();
-      const ids = [];
+      const ids: string[] = [];
       graph.nodeF.traverse(
           node => ids.push(node.id),
           node => node.getDependencies(),
@@ -295,9 +302,9 @@ describe('BaseNode', () => {
       //   B
       //  / \
       // A - C
-      const nodeA = new BaseNode('A');
-      const nodeB = new BaseNode('B');
-      const nodeC = new BaseNode('C');
+      const nodeA = makeFakeNode('A');
+      const nodeB = makeFakeNode('B');
+      const nodeC = makeFakeNode('C');
 
       nodeA.addDependent(nodeC);
       nodeA.addDependent(nodeB);
@@ -308,9 +315,9 @@ describe('BaseNode', () => {
 
     it('should return true for basic cycles', () => {
       // A - B - C - A!
-      const nodeA = new BaseNode('A');
-      const nodeB = new BaseNode('B');
-      const nodeC = new BaseNode('C');
+      const nodeA = makeFakeNode('A');
+      const nodeB = makeFakeNode('B');
+      const nodeC = makeFakeNode('C');
 
       nodeA.addDependent(nodeB);
       nodeB.addDependent(nodeC);
@@ -323,9 +330,9 @@ describe('BaseNode', () => {
       //       A!
       //      /
       // A - B - C
-      const nodeA = new BaseNode('A');
-      const nodeB = new BaseNode('B');
-      const nodeC = new BaseNode('C');
+      const nodeA = makeFakeNode('A');
+      const nodeB = makeFakeNode('B');
+      const nodeC = makeFakeNode('C');
 
       nodeA.addDependent(nodeB);
       nodeB.addDependent(nodeC);
@@ -338,14 +345,14 @@ describe('BaseNode', () => {
       //   B - D - F - G - C!
       //  /      /
       // A - - C - E - H
-      const nodeA = new BaseNode('A');
-      const nodeB = new BaseNode('B');
-      const nodeC = new BaseNode('C');
-      const nodeD = new BaseNode('D');
-      const nodeE = new BaseNode('E');
-      const nodeF = new BaseNode('F');
-      const nodeG = new BaseNode('G');
-      const nodeH = new BaseNode('H');
+      const nodeA = makeFakeNode('A');
+      const nodeB = makeFakeNode('B');
+      const nodeC = makeFakeNode('C');
+      const nodeD = makeFakeNode('D');
+      const nodeE = makeFakeNode('E');
+      const nodeF = makeFakeNode('F');
+      const nodeG = makeFakeNode('G');
+      const nodeH = makeFakeNode('H');
 
       nodeA.addDependent(nodeB);
       nodeA.addDependent(nodeC);
@@ -368,11 +375,11 @@ describe('BaseNode', () => {
     });
 
     it('works for very large graphs', () => {
-      const root = new BaseNode('root');
+      const root = makeFakeNode('root');
 
       let lastNode = root;
       for (let i = 0; i < 10000; i++) {
-        const nextNode = new BaseNode(`child${i}`);
+        const nextNode = makeFakeNode(`child${i}`);
         lastNode.addDependent(nextNode);
         lastNode = nextNode;
       }

package/front_end/models/trace/lantern/graph/BaseNode.ts

@@ -132,6 +132,7 @@ class BaseNode<T = Lantern.AnyNetworkObject> {
     this.dependencies.splice(this.dependencies.indexOf(node), 1);
   }
 
+  // Unused in devtools, but used in LH.
   removeAllDependencies(): void {
     for (const node of this.dependencies.slice()) {
       this.removeDependency(node);
@@ -179,7 +180,7 @@ class BaseNode<T = Lantern.AnyNetworkObject> {
    * node this was called on is not included in the resulting filtered graph, the method will throw.
    *
    * This does not clone NetworkNode's `record` or `rawRecord` fields. It may be reasonable to clone the former,
-   * to assist in graph construction, but the latter should never be cloned as one contraint of Lantern is that
+   * to assist in graph construction, but the latter should never be cloned as one constraint of Lantern is that
    * the underlying data records are accessible for plain object reference equality checks.
    */
   cloneWithRelationships(predicate?: (arg0: Node) => boolean): Node {

package/front_end/models/trace/lantern/graph/CPUNode.ts

@@ -2,9 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import {BaseNode} from './BaseNode.js';
 import type * as Lantern from '../types/types.js';
 
+import {BaseNode} from './BaseNode.js';
+
 class CPUNode<T = Lantern.AnyNetworkObject> extends BaseNode<T> {
   _event: Lantern.TraceEvent;
   _childEvents: Lantern.TraceEvent[];

package/front_end/models/trace/lantern/graph/NetworkNode.ts

@@ -2,9 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import {BaseNode} from './BaseNode.js';
 import type * as Lantern from '../types/types.js';
 
+import {BaseNode} from './BaseNode.js';
+
 const NON_NETWORK_SCHEMES = [
   'blob',        // @see https://developer.mozilla.org/en-US/docs/Web/API/URL/createObjectURL
   'data',        // @see https://developer.mozilla.org/en-US/docs/Web/HTTP/Basics_of_HTTP/Data_URIs