ObjFW  Diff

Differences From Artifact [40faae77ac]:

To Artifact [90c837e175]:


18
19
20
21
22
23
24

25
26
27
28

29
30

31
32

33

34

35
36
37
38
39






40
41
42
43

44
45

46
47
48
49
50
51
52
53
54

55
56
57
58
59

60
61
62

63
64
65

66
67
68
69
70

71
72
73
74
75

76
77
78

79
80
81

82
83
84
85
86

87
88
89

90
91
92

93
94

95
96
97

98
99

100
101
102
103

104
105
106
107

108
109
110
111

112
113
114
115
116

117
118
119

120
121
122
123
124

125
126
127

128
129
130

131
132
133

134
135
136
137
138






139
140
141

142
143
144

145
146
147
148
149

150
151
152

153
154
155

156
157
158
159
160

161
162

163
164
165
166

167
168

169
170
171
172
173
174
175
176
177

178
179
180




181
182

183
184
185
186


187
188
189
190





191
192

193
194
195
196

197
198
199
200
201
202


203
204

205
206
207

208
209
210
211
212

213
214

215
216
217
218
219

220
221
222




223
224
225
226
227
228


229
230
231
232





233
234

235
236
237
238

239
240
241
242
243
244
245


246
247

248
249
250

251
252
253
254
255
256

257
258

259
260
261


262
263

264
265

266
267
268
269
270
271

272
273

274
275
276

277
278
279
280
281
282
283


284
285

286
287
288
289

290
291
292

293
294

295
296

297
298

299
300

301
302

303
304

305
306

307
308
309
310

311
312

313
314

315
316
317

318
319

320
321

322
323
324

325
326

327
328

329
330
331

332
333

334
335

336
337
338

339
340

341
342

343
344
345

346
347

348
349

350
351
352
353

354
355

356
357

358
359
360

361
362

363
364

365
366
367
368
369
370
371


372
373
374
375
376
377
378

18
19
20
21
22
23
24
25
26
27
28

29
30

31
32

33
34
35

36
37




38
39
40
41
42
43
44
45
46

47
48

49
50
51







52
53
54
55
56

57
58
59

60
61
62

63
64
65
66
67

68
69
70
71
72

73
74
75

76
77
78

79
80
81
82
83

84
85
86

87
88
89

90
91

92
93
94

95
96

97

98
99

100
101
102
103

104
105
106
107

108
109
110
111


112
113
114

115
116
117
118
119

120
121
122

123
124
125

126
127
128

129
130




131
132
133
134
135
136
137
138

139
140
141

142
143
144
145
146

147
148
149

150
151
152

153
154
155
156
157

158
159

160
161
162
163

164
165

166
167

168
169
170
171
172
173

174
175


176
177
178
179
180

181
182
183


184
185
186



187
188
189
190
191
192

193
194
195
196

197
198
199
200
201
202

203
204
205

206
207
208

209
210
211
212
213

214
215

216
217
218
219
220

221
222


223
224
225
226
227
228
229
230


231
232
233



234
235
236
237
238
239

240
241
242
243

244
245
246
247
248
249
250

251
252
253

254
255
256

257
258
259
260
261
262

263
264

265
266
267
268
269
270
271

272
273

274
275
276
277
278
279

280
281

282
283
284

285
286
287
288
289
290


291
292
293

294
295
296
297

298
299
300

301
302

303
304

305
306

307
308

309
310

311
312

313
314

315
316
317
318

319
320

321
322

323
324
325

326
327

328
329

330
331
332

333
334

335
336

337
338
339

340
341

342
343

344
345
346

347
348

349
350

351
352
353

354
355

356
357

358
359
360
361

362
363

364
365

366
367
368

369
370

371
372

373
374
375
376
377
378


379
380
381
382
383
384
385
386

387







+



-
+

-
+

-
+

+
-
+

-
-
-
-
+
+
+
+
+
+



-
+

-
+


-
-
-
-
-
-
-
+




-
+


-
+


-
+




-
+




-
+


-
+


-
+




-
+


-
+


-
+

-
+


-
+

-
+
-


-
+



-
+



-
+



-
-
+


-
+




-
+


-
+


-
+


-
+

-
-
-
-
+
+
+
+
+
+


-
+


-
+




-
+


-
+


-
+




-
+

-
+



-
+

-
+

-






-
+

-
-
+
+
+
+

-
+


-
-
+
+

-
-
-
+
+
+
+
+

-
+



-
+





-
+
+

-
+


-
+




-
+

-
+




-
+

-
-
+
+
+
+




-
-
+
+

-
-
-
+
+
+
+
+

-
+



-
+






-
+
+

-
+


-
+





-
+

-
+



+
+

-
+

-
+





-
+

-
+


-
+





-
-
+
+

-
+



-
+


-
+

-
+

-
+

-
+

-
+

-
+

-
+

-
+



-
+

-
+

-
+


-
+

-
+

-
+


-
+

-
+

-
+


-
+

-
+

-
+


-
+

-
+

-
+


-
+

-
+

-
+



-
+

-
+

-
+


-
+

-
+

-
+





-
-
+
+






-
+
#import "OFSerialization.h"

OF_ASSUME_NONNULL_BEGIN

@class OFArray OF_GENERIC(ObjectType);
@class OFDictionary OF_GENERIC(KeyType, ObjectType);
@class OFNumber;
@class OFPair OF_GENERIC(FirstType, SecondType);
@class OFString;

/**
 * @class OFURL OFURL.h ObjFW/OFURL.h
 * @class OFURI OFURI.h ObjFW/OFURI.h
 *
 * @brief A class for parsing URLs and accessing parts of it.
 * @brief A class for parsing URIs as per RFC 3986 and accessing parts of it.
 */
@interface OFURL: OFObject <OFCopying, OFMutableCopying, OFSerialization>
@interface OFURI: OFObject <OFCopying, OFMutableCopying, OFSerialization>
{
	OFString *_scheme;
	OFString *_Nullable _URLEncodedScheme, *_Nullable _URLEncodedHost;
	OFString *_Nullable _percentEncodedHost;
	OFNumber *_Nullable _port;
	OFString *_Nullable _URLEncodedUser, *_Nullable _URLEncodedPassword;
	OFString *_Nullable _URLEncodedPath;
	OFString *_Nullable _URLEncodedQuery, *_Nullable _URLEncodedFragment;
	OF_RESERVE_IVARS(OFURL, 4)
	OFString *_Nullable _percentEncodedUser;
	OFString *_Nullable _percentEncodedPassword;
	OFString *_percentEncodedPath;
	OFString *_Nullable _percentEncodedQuery;
	OFString *_Nullable _percentEncodedFragment;
	OF_RESERVE_IVARS(OFURI, 4)
}

/**
 * @brief The scheme part of the URL.
 * @brief The scheme part of the URI.
 */
@property OF_NULLABLE_PROPERTY (readonly, copy, nonatomic) OFString *scheme;
@property (readonly, copy, nonatomic) OFString *scheme;

/**
 * @brief The scheme part of the URL in URL-encoded form.
 */
@property OF_NULLABLE_PROPERTY (readonly, copy, nonatomic)
    OFString *URLEncodedScheme;

/**
 * @brief The host part of the URL.
 * @brief The host part of the URI.
 */
@property OF_NULLABLE_PROPERTY (readonly, copy, nonatomic) OFString *host;

/**
 * @brief The host part of the URL in URL-encoded form.
 * @brief The host part of the URI in percent-encoded form.
 */
@property OF_NULLABLE_PROPERTY (readonly, copy, nonatomic)
    OFString *URLEncodedHost;
    OFString *percentEncodedHost;

/**
 * @brief The port part of the URL.
 * @brief The port part of the URI.
 */
@property OF_NULLABLE_PROPERTY (readonly, copy, nonatomic) OFNumber *port;

/**
 * @brief The user part of the URL.
 * @brief The user part of the URI.
 */
@property OF_NULLABLE_PROPERTY (readonly, copy, nonatomic) OFString *user;

/**
 * @brief The user part of the URL in URL-encoded form.
 * @brief The user part of the URI in percent-encoded form.
 */
@property OF_NULLABLE_PROPERTY (readonly, copy, nonatomic)
    OFString *URLEncodedUser;
    OFString *percentEncodedUser;

/**
 * @brief The password part of the URL.
 * @brief The password part of the URI.
 */
@property OF_NULLABLE_PROPERTY (readonly, copy, nonatomic) OFString *password;

/**
 * @brief The password part of the URL in URL-encoded form.
 * @brief The password part of the URI in percent-encoded form.
 */
@property OF_NULLABLE_PROPERTY (readonly, copy, nonatomic)
    OFString *URLEncodedPassword;
    OFString *percentEncodedPassword;

/**
 * @brief The path part of the URL.
 * @brief The path part of the URI.
 */
@property OF_NULLABLE_PROPERTY (readonly, copy, nonatomic) OFString *path;
@property (readonly, copy, nonatomic) OFString *path;

/**
 * @brief The path part of the URL in URL-encoded form.
 * @brief The path part of the URI in percent-encoded form.
 */
@property OF_NULLABLE_PROPERTY (readonly, copy, nonatomic)
@property (readonly, copy, nonatomic) OFString *percentEncodedPath;
    OFString *URLEncodedPath;

/**
 * @brief The path of the URL split into components.
 * @brief The path of the URI split into components.
 *
 * The first component must always be `/` to designate the root.
 */
@property OF_NULLABLE_PROPERTY (readonly, copy, nonatomic)
@property (readonly, copy, nonatomic)
    OFArray OF_GENERIC(OFString *) *pathComponents;

/**
 * @brief The last path component of the URL.
 * @brief The last path component of the URI.
 *
 * Returns the empty string if the path is the root.
 */
@property OF_NULLABLE_PROPERTY (readonly, copy, nonatomic)
    OFString *lastPathComponent;
@property (readonly, copy, nonatomic) OFString *lastPathComponent;

/**
 * @brief The query part of the URL.
 * @brief The query part of the URI.
 */
@property OF_NULLABLE_PROPERTY (readonly, copy, nonatomic) OFString *query;

/**
 * @brief The query part of the URL in URL-encoded form.
 * @brief The query part of the URI in percent-encoded form.
 */
@property OF_NULLABLE_PROPERTY (readonly, copy, nonatomic)
    OFString *URLEncodedQuery;
    OFString *percentEncodedQuery;

/**
 * @brief The query part of the URL as a dictionary.
 * @brief The query part of the URI as an array.
 *
 * For example, a query like `key1=value1&key2=value2` would correspond to the
 * following dictionary:
 * following array:
 *
 *     @{
 *         @"key1": @"value1",
 *         @"key2": @"value2"
 *     }
 *     @[
 *         [OFPair pairWithFirstObject: @"key1" secondObject: @"value1"],
 *         [OFPair pairWithFirstObject: @"key2" secondObject: @"value2"],
 *     ]
 *
 * @throw OFInvalidFormatException The query is not in the correct format
 */
@property OF_NULLABLE_PROPERTY (readonly, copy, nonatomic)
    OFDictionary OF_GENERIC(OFString *, OFString *) *queryDictionary;
    OFArray OF_GENERIC(OFPair OF_GENERIC(OFString *, OFString *) *) *queryItems;

/**
 * @brief The fragment part of the URL.
 * @brief The fragment part of the URI.
 */
@property OF_NULLABLE_PROPERTY (readonly, copy, nonatomic) OFString *fragment;

/**
 * @brief The fragment part of the URL in URL-encoded form.
 * @brief The fragment part of the URI in URI-encoded form.
 */
@property OF_NULLABLE_PROPERTY (readonly, copy, nonatomic)
    OFString *URLEncodedFragment;
    OFString *percentEncodedFragment;

/**
 * @brief The URL as a string.
 * @brief The URI as a string.
 */
@property (readonly, nonatomic) OFString *string;

/**
 * @brief The URL with relative subpaths resolved.
 * @brief The URI with relative subpaths resolved.
 */
@property (readonly, nonatomic) OFURL *URLByStandardizingPath;
@property (readonly, nonatomic) OFURI *URIByStandardizingPath;

#ifdef OF_HAVE_FILES
/**
 * @brief The local file system representation for a file URL.
 * @brief The local file system representation for a file URI.
 *
 * @note This only exists for URLs with the file scheme and throws an exception
 * @note This only exists for URIs with the file scheme and throws an exception
 *	 otherwise.
 *
 */
@property OF_NULLABLE_PROPERTY (readonly, nonatomic)
    OFString *fileSystemRepresentation;
#endif

/**
 * @brief Creates a new URL with the specified string.
 * @brief Creates a new URI with the specified string.
 *
 * @param string A string describing a URL
 * @return A new, autoreleased OFURL
 * @param string A string describing a URI
 * @return A new, autoreleased OFURI
 * @throw OFInvalidFormatException The specified string is not a valid URI
 *				   string
 */
+ (instancetype)URLWithString: (OFString *)string;
+ (instancetype)URIWithString: (OFString *)string;

/**
 * @brief Creates a new URL with the specified string relative to the
 *	  specified URL.
 * @brief Creates a new URI with the specified string relative to the
 *	  specified URI.
 *
 * @param string A string describing a URL
 * @param URL An URL to which the string is relative
 * @return A new, autoreleased OFURL
 * @param string A string describing a relative or absolute URI
 * @param URI An URI to which the string is relative
 * @return A new, autoreleased OFURI
 * @throw OFInvalidFormatException The specified string is not a valid URI
 *				   string
 */
+ (instancetype)URLWithString: (OFString *)string relativeToURL: (OFURL *)URL;
+ (instancetype)URIWithString: (OFString *)string relativeToURI: (OFURI *)URI;

#ifdef OF_HAVE_FILES
/**
 * @brief Creates a new URL with the specified local file path.
 * @brief Creates a new URI with the specified local file path.
 *
 * If a directory exists at the specified path, a slash is appended if there is
 * no slash yet.
 *
 * @param path The local file path
 * @return A new, autoreleased OFURL
 * @return A new, autoreleased OFURI
 * @throw OFInvalidFormatException The specified path is not a valid path
 */
+ (instancetype)fileURLWithPath: (OFString *)path;
+ (instancetype)fileURIWithPath: (OFString *)path;

/**
 * @brief Creates a new URL with the specified local file path.
 * @brief Creates a new URI with the specified local file path.
 *
 * @param path The local file path
 * @param isDirectory Whether the path is a directory, in which case a slash is
 *		      appened if there is no slash yet
 * @return An Initialized OFURL
 * @return An initialized OFURI
 */
+ (instancetype)fileURLWithPath: (OFString *)path
+ (instancetype)fileURIWithPath: (OFString *)path
		    isDirectory: (bool)isDirectory;
#endif

/**
 * @brief Initializes an already allocated OFURL with the specified string.
 * @brief Initializes an already allocated OFURI with the specified string.
 *
 * @param string A string describing a URL
 * @return An initialized OFURL
 * @param string A string describing a URI
 * @return An initialized OFURI
 * @throw OFInvalidFormatException The specified string is not a valid URI
 *				   string
 */
- (instancetype)initWithString: (OFString *)string;

/**
 * @brief Initializes an already allocated OFURL with the specified string and
 *	  relative URL.
 * @brief Initializes an already allocated OFURI with the specified string and
 *	  relative URI.
 *
 * @param string A string describing a URL
 * @param URL A URL to which the string is relative
 * @return An initialized OFURL
 * @param string A string describing a relative or absolute URI
 * @param URI A URI to which the string is relative
 * @return An initialized OFURI
 * @throw OFInvalidFormatException The specified string is not a valid URI
 *				   string
 */
- (instancetype)initWithString: (OFString *)string relativeToURL: (OFURL *)URL;
- (instancetype)initWithString: (OFString *)string relativeToURI: (OFURI *)URI;

#ifdef OF_HAVE_FILES
/**
 * @brief Initializes an already allocated OFURL with the specified local file
 * @brief Initializes an already allocated OFURI with the specified local file
 *	  path.
 *
 * If a directory exists at the specified path, a slash is appended if there is
 * no slash yet.
 *
 * @param path The local file path
 * @return An initialized OFURL
 * @return An initialized OFURI
 * @throw OFInvalidFormatException The specified path is not a valid path
 */
- (instancetype)initFileURLWithPath: (OFString *)path;
- (instancetype)initFileURIWithPath: (OFString *)path;

/**
 * @brief Initializes an already allocated OFURL with the specified local file
 * @brief Initializes an already allocated OFURI with the specified local file
 *	  path.
 *
 * @param path The local file path
 * @param isDirectory Whether the path is a directory, in which case a slash is
 *		      appened if there is no slash yet
 * @return An Initialized OFURL
 * @return An initialized OFURI
 */
- (instancetype)initFileURLWithPath: (OFString *)path
- (instancetype)initFileURIWithPath: (OFString *)path
			isDirectory: (bool)isDirectory;
#endif

- (instancetype)init OF_UNAVAILABLE;

/**
 * @brief Returns a new URL with the specified path component appended.
 * @brief Returns a new URI with the specified path component appended.
 *
 * If the URL is a file URL, the file system is queried whether the appended
 * If the URI is a file URI, the file system is queried whether the appended
 * component is a directory.
 *
 * @param component The path component to append. If it starts with the slash,
 *		    the component is not appended, but replaces the path
 *		    instead.
 * @return A new URL with the specified path component appended
 * @return A new URI with the specified path component appended
 */
- (OFURL *)URLByAppendingPathComponent: (OFString *)component;
- (OFURI *)URIByAppendingPathComponent: (OFString *)component;

/**
 * @brief Returns a new URL with the specified path component appended.
 * @brief Returns a new URI with the specified path component appended.
 *
 * @param component The path component to append. If it starts with the slash,
 *		    the component is not appended, but replaces the path
 *		    instead.
 * @param isDirectory Whether the appended component is a directory, meaning
 *		      that the URL path should have a trailing slash
 * @return A new URL with the specified path component appended
 *		      that the URI path should have a trailing slash
 * @return A new URI with the specified path component appended
 */
- (OFURL *)URLByAppendingPathComponent: (OFString *)component
- (OFURI *)URIByAppendingPathComponent: (OFString *)component
			   isDirectory: (bool)isDirectory;
@end

@interface OFCharacterSet (URLCharacterSets)
@interface OFCharacterSet (URICharacterSets)
#ifdef OF_HAVE_CLASS_PROPERTIES
@property (class, readonly, nonatomic)
    OFCharacterSet *URLSchemeAllowedCharacterSet;
    OFCharacterSet *URISchemeAllowedCharacterSet;
@property (class, readonly, nonatomic)
    OFCharacterSet *URLHostAllowedCharacterSet;
    OFCharacterSet *URIHostAllowedCharacterSet;
@property (class, readonly, nonatomic)
    OFCharacterSet *URLUserAllowedCharacterSet;
    OFCharacterSet *URIUserAllowedCharacterSet;
@property (class, readonly, nonatomic)
    OFCharacterSet *URLPasswordAllowedCharacterSet;
    OFCharacterSet *URIPasswordAllowedCharacterSet;
@property (class, readonly, nonatomic)
    OFCharacterSet *URLPathAllowedCharacterSet;
    OFCharacterSet *URIPathAllowedCharacterSet;
@property (class, readonly, nonatomic)
    OFCharacterSet *URLQueryAllowedCharacterSet;
    OFCharacterSet *URIQueryAllowedCharacterSet;
@property (class, readonly, nonatomic)
    OFCharacterSet *URLQueryKeyValueAllowedCharacterSet;
    OFCharacterSet *URIQueryKeyValueAllowedCharacterSet;
@property (class, readonly, nonatomic)
    OFCharacterSet *URLFragmentAllowedCharacterSet;
    OFCharacterSet *URIFragmentAllowedCharacterSet;
#endif

/**
 * @brief Returns the characters allowed in the scheme part of a URL.
 * @brief Returns the characters allowed in the scheme part of a URI.
 *
 * @return The characters allowed in the scheme part of a URL.
 * @return The characters allowed in the scheme part of a URI.
 */
+ (OFCharacterSet *)URLSchemeAllowedCharacterSet;
+ (OFCharacterSet *)URISchemeAllowedCharacterSet;

/**
 * @brief Returns the characters allowed in the host part of a URL.
 * @brief Returns the characters allowed in the host part of a URI.
 *
 * @return The characters allowed in the host part of a URL.
 * @return The characters allowed in the host part of a URI.
 */
+ (OFCharacterSet *)URLHostAllowedCharacterSet;
+ (OFCharacterSet *)URIHostAllowedCharacterSet;

/**
 * @brief Returns the characters allowed in the user part of a URL.
 * @brief Returns the characters allowed in the user part of a URI.
 *
 * @return The characters allowed in the user part of a URL.
 * @return The characters allowed in the user part of a URI.
 */
+ (OFCharacterSet *)URLUserAllowedCharacterSet;
+ (OFCharacterSet *)URIUserAllowedCharacterSet;

/**
 * @brief Returns the characters allowed in the password part of a URL.
 * @brief Returns the characters allowed in the password part of a URI.
 *
 * @return The characters allowed in the password part of a URL.
 * @return The characters allowed in the password part of a URI.
 */
+ (OFCharacterSet *)URLPasswordAllowedCharacterSet;
+ (OFCharacterSet *)URIPasswordAllowedCharacterSet;

/**
 * @brief Returns the characters allowed in the path part of a URL.
 * @brief Returns the characters allowed in the path part of a URI.
 *
 * @return The characters allowed in the path part of a URL.
 * @return The characters allowed in the path part of a URI.
 */
+ (OFCharacterSet *)URLPathAllowedCharacterSet;
+ (OFCharacterSet *)URIPathAllowedCharacterSet;

/**
 * @brief Returns the characters allowed in the query part of a URL.
 * @brief Returns the characters allowed in the query part of a URI.
 *
 * @return The characters allowed in the query part of a URL.
 * @return The characters allowed in the query part of a URI.
 */
+ (OFCharacterSet *)URLQueryAllowedCharacterSet;
+ (OFCharacterSet *)URIQueryAllowedCharacterSet;

/**
 * @brief Returns the characters allowed in a key/value in the query part of a
 *	  URL.
 *	  URI.
 *
 * @return The characters allowed in a key/value in the query part of a URL.
 * @return The characters allowed in a key/value in the query part of a URI.
 */
+ (OFCharacterSet *)URLQueryKeyValueAllowedCharacterSet;
+ (OFCharacterSet *)URIQueryKeyValueAllowedCharacterSet;

/**
 * @brief Returns the characters allowed in the fragment part of a URL.
 * @brief Returns the characters allowed in the fragment part of a URI.
 *
 * @return The characters allowed in the fragment part of a URL.
 * @return The characters allowed in the fragment part of a URI.
 */
+ (OFCharacterSet *)URLFragmentAllowedCharacterSet;
+ (OFCharacterSet *)URIFragmentAllowedCharacterSet;
@end

#ifdef __cplusplus
extern "C" {
#endif
extern bool OFURLIsIPv6Host(OFString *host);
extern void OFURLVerifyIsEscaped(OFString *, OFCharacterSet *);
extern bool OFURIIsIPv6Host(OFString *host);
extern void OFURIVerifyIsEscaped(OFString *, OFCharacterSet *, bool);
#ifdef __cplusplus
}
#endif

OF_ASSUME_NONNULL_END

#import "OFMutableURL.h"
#import "OFMutableURI.h"