improve file url detection

Author: warrenday

src/helpers/networkHelpers.test.ts

@@ -400,9 +400,21 @@ describe('networkHelpers.getRequestBody', () => {
 describe('networkHelpers.urlHasFileExtension', () => {
   it('returns true if the url ends with a file extension', () => {
     expect(urlHasFileExtension('http://example.com/test.js')).toBe(true)
+    expect(urlHasFileExtension('http://example.com/style.css')).toBe(true)
+    expect(urlHasFileExtension('http://example.com/file.png?query=test')).toBe(
+      true
+    )
   })
 
   it('returns false if the url does not end with a file extension', () => {
     expect(urlHasFileExtension('http://example.com/test')).toBe(false)
+    expect(urlHasFileExtension('http://test.example.com')).toBe(false)
+    expect(urlHasFileExtension('http://test.example.com/test')).toBe(false)
+  })
+
+  it('returns false for query params containing dots', () => {
+    expect(urlHasFileExtension('http://example.com/test?query=query.ts')).toBe(
+      false
+    )
   })
 })

src/helpers/networkHelpers.ts

@@ -50,7 +50,19 @@ export interface IIncompleteNetworkRequest
  * @returns true if the url ends with a file extension (e.g. .js, .css, .png)
  */
 export const urlHasFileExtension = (url: string): boolean => {
-  // Check if URL ends with a file extension (e.g. .js, .css, .png)
+  // Try to parse the url as a URL object
+  try {
+    const urlObject = new URL(url)
+    if (urlObject.pathname.includes('.')) {
+      return true
+    } else {
+      return false
+    }
+  } catch (e) {
+    // noop
+  }
+
+  // If parsing fails, just check the last part of the url
   const urlParts = url.split('/')
   const lastPart = urlParts[urlParts.length - 1]
   return lastPart.includes('.')

src/mocks/mock-requests.ts

@@ -279,16 +279,15 @@ export const mockRequests: IMockRequest[] = [
     request: [
       {
         query: `
-          fragment NameParts on Person {
-            firstName
-            lastName
+          fragment MovieDetails on Movie {
+            id
+            title
+            genre
           }
 
           query getMovieQuery($title: String) {
             getMovie(title: $title) {
-              id
-              title
-              genre
+              ...MovieDetails
             }
           }
         `,