17238365990

Committed 26 Aug 2025 12:38PM UTC coverage: 48.936% (-28.5%) from 77.386%

Build # 17238365990

Build Type

Pull #781

github

Committed by

web-flow

Commit Message

Merge 95ac7642e into e4d8c3718

Pull Request Pull Request #781: RFC: Migrate HTTP networking from URLSession to Alamofire

Run Details

287 of 986 new or added lines in 26 files covered. (29.11%)

1397 existing lines in 30 files now uncovered.

3448 of 7046 relevant lines covered (48.94%)

5.24 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

72.22

/Sources/Helpers/FoundationExtensions.swift

//
//  FoundationExtensions.swift
//
//
//  Created by Guilherme Souza on 23/04/24.
//

import Foundation

#if canImport(FoundationNetworking)
  import FoundationNetworking

  package let NSEC_PER_SEC: UInt64 = 1_000_000_000
  package let NSEC_PER_MSEC: UInt64 = 1_000_000
#endif

extension Result {
  package var value: Success? {
    if case let .success(value) = self {
      value
    } else {
      nil
    }
  }

  package var error: Failure? {
    if case let .failure(error) = self {
      error
    } else {
      nil
    }
  }
}

extension URL {
  // package var queryItems: [URLQueryItem] {
  //   get {
  //     URLComponents(url: self, resolvingAgainstBaseURL: false)?.percentEncodedQueryItems ?? []
  //   }
  //   set {
  //     appendOrUpdateQueryItems(newValue)
  //   }
  // }

  package mutating func appendQueryItems(_ queryItems: [URLQueryItem]) {
    guard !queryItems.isEmpty else {
      return
    }

    guard var components = URLComponents(url: self, resolvingAgainstBaseURL: false) else {
      return
    }

    let currentQueryItems = components.percentEncodedQueryItems ?? []

    components.percentEncodedQueryItems =
      currentQueryItems
      + queryItems.map {
        URLQueryItem(
          name: escape($0.name),
          value: $0.value.map(escape)
        )
      }

    if let newURL = components.url {
      self = newURL
    }
  }

  package func appendingQueryItems(_ queryItems: [URLQueryItem]) -> URL {
    var url = self
    url.appendQueryItems(queryItems)
    return url
  }

  // package mutating func appendOrUpdateQueryItems(_ queryItems: [URLQueryItem]) {
  //   guard !queryItems.isEmpty else {
  //     return
  //   }

  //   guard var components = URLComponents(url: self, resolvingAgainstBaseURL: false) else {
  //     return
  //   }

  //   var currentQueryItems = components.percentEncodedQueryItems ?? []

  //   for var queryItem in queryItems {
  //     queryItem.name = escape(queryItem.name)
  //     queryItem.value = queryItem.value.map(escape)
  //     if let index = currentQueryItems.firstIndex(where: { $0.name == queryItem.name }) {
  //       currentQueryItems[index] = queryItem
  //     } else {
  //       currentQueryItems.append(queryItem)
  //     }
  //   }

  //   components.percentEncodedQueryItems = currentQueryItems

  //   if let newURL = components.url {
  //     self = newURL
  //   }
  // }

  // package func appendingOrUpdatingQueryItems(_ queryItems: [URLQueryItem]) -> URL {
  //   var url = self
  //   url.appendOrUpdateQueryItems(queryItems)
  //   return url
  // }
}

func escape(_ string: String) -> String {
  string.addingPercentEncoding(withAllowedCharacters: .sbURLQueryAllowed) ?? string
}

extension CharacterSet {
  /// Creates a CharacterSet from RFC 3986 allowed characters.
  ///
  /// RFC 3986 states that the following characters are "reserved" characters.
  ///
  /// - General Delimiters: ":", "#", "[", "]", "@", "?", "/"
  /// - Sub-Delimiters: "!", "$", "&", "'", "(", ")", "*", "+", ",", ";", "="
  ///
  /// In RFC 3986 - Section 3.4, it states that the "?" and "/" characters should not be escaped to allow
  /// query strings to include a URL. Therefore, all "reserved" characters with the exception of "?" and "/"
  /// should be percent-escaped in the query string.
  static let sbURLQueryAllowed: CharacterSet = {
    let generalDelimitersToEncode = ":#[]@"  // does not include "?" or "/" due to RFC 3986 - Section 3.4
    let subDelimitersToEncode = "!$&'()*+,;="
    let encodableDelimiters = CharacterSet(
      charactersIn: "\(generalDelimitersToEncode)\(subDelimitersToEncode)")

    return CharacterSet.urlQueryAllowed.subtracting(encodableDelimiters)
  }()
}

1	//
2	// FoundationExtensions.swift
3	//
4	//
5	// Created by Guilherme Souza on 23/04/24.
6	//
7
8	import Foundation
9
10	#if canImport(FoundationNetworking)
11	import FoundationNetworking
12
13	package let NSEC_PER_SEC: UInt64 = 1_000_000_000
14	package let NSEC_PER_MSEC: UInt64 = 1_000_000
15	#endif
16
17	extension Result {
UNCOV 18	package var value: Success? {	×
UNCOV 19	if case let .success(value) = self {	×
UNCOV 20	value	×
UNCOV 21	} else {	×
UNCOV 22	nil	×
UNCOV 23	}	×
UNCOV 24	}	×
25
UNCOV 26	package var error: Failure? {	×
UNCOV 27	if case let .failure(error) = self {	×
UNCOV 28	error	×
UNCOV 29	} else {	×
UNCOV 30	nil	×
UNCOV 31	}	×
UNCOV 32	}	×
33	}
34
35	extension URL {
36	// package var queryItems: [URLQueryItem] {
37	// get {
38	// URLComponents(url: self, resolvingAgainstBaseURL: false)?.percentEncodedQueryItems ?? []
39	// }
40	// set {
41	// appendOrUpdateQueryItems(newValue)
42	// }
43	// }
44
45	package mutating func appendQueryItems(_ queryItems: [URLQueryItem]) {	16✔
46	guard !queryItems.isEmpty else {	16✔
47	return	12✔
48	}	12✔
49		4✔
50	guard var components = URLComponents(url: self, resolvingAgainstBaseURL: false) else {	4✔
51	return	×
52	}	4✔
53		4✔
54	let currentQueryItems = components.percentEncodedQueryItems ?? []	4✔
55		4✔
56	components.percentEncodedQueryItems =	4✔
57	currentQueryItems	4✔
58	+ queryItems.map {	5✔
59	URLQueryItem(	5✔
60	name: escape($0.name),	5✔
61	value: $0.value.map(escape)	5✔
62	)	5✔
63	}	5✔
64		4✔
65	if let newURL = components.url {	4✔
66	self = newURL	4✔
67	}	4✔
68	}	4✔
69
70	package func appendingQueryItems(_ queryItems: [URLQueryItem]) -> URL {	16✔
71	var url = self	16✔
72	url.appendQueryItems(queryItems)	16✔
73	return url	16✔
74	}	16✔
75
76	// package mutating func appendOrUpdateQueryItems(_ queryItems: [URLQueryItem]) {
77	// guard !queryItems.isEmpty else {
78	// return
79	// }
80
81	// guard var components = URLComponents(url: self, resolvingAgainstBaseURL: false) else {
82	// return
83	// }
84
85	// var currentQueryItems = components.percentEncodedQueryItems ?? []
86
87	// for var queryItem in queryItems {
88	// queryItem.name = escape(queryItem.name)
89	// queryItem.value = queryItem.value.map(escape)
90	// if let index = currentQueryItems.firstIndex(where: { $0.name == queryItem.name }) {
91	// currentQueryItems[index] = queryItem
92	// } else {
93	// currentQueryItems.append(queryItem)
94	// }
95	// }
96
97	// components.percentEncodedQueryItems = currentQueryItems
98
99	// if let newURL = components.url {
100	// self = newURL
101	// }
102	// }
103
104	// package func appendingOrUpdatingQueryItems(_ queryItems: [URLQueryItem]) -> URL {
105	// var url = self
106	// url.appendOrUpdateQueryItems(queryItems)
107	// return url
108	// }
109	}
110
111	func escape(_ string: String) -> String {	10✔
112	string.addingPercentEncoding(withAllowedCharacters: .sbURLQueryAllowed) ?? string	10✔
113	}	10✔
114
115	extension CharacterSet {
116	/// Creates a CharacterSet from RFC 3986 allowed characters.
117	///
118	/// RFC 3986 states that the following characters are "reserved" characters.
119	///
120	/// - General Delimiters: ":", "#", "[", "]", "@", "?", "/"
121	/// - Sub-Delimiters: "!", "$", "&", "'", "(", ")", "*", "+", ",", ";", "="
122	///
123	/// In RFC 3986 - Section 3.4, it states that the "?" and "/" characters should not be escaped to allow
124	/// query strings to include a URL. Therefore, all "reserved" characters with the exception of "?" and "/"
125	/// should be percent-escaped in the query string.
126	static let sbURLQueryAllowed: CharacterSet = {	2✔
127	let generalDelimitersToEncode = ":#[]@" // does not include "?" or "/" due to RFC 3986 - Section 3.4	2✔
128	let subDelimitersToEncode = "!$&'()*+,;="	2✔
129	let encodableDelimiters = CharacterSet(	2✔
130	charactersIn: "\(generalDelimitersToEncode)\(subDelimitersToEncode)")	2✔
131		2✔
132	return CharacterSet.urlQueryAllowed.subtracting(encodableDelimiters)	2✔
133	}()	2✔
134	}

supabase / supabase-swift / 17238365990

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous