rez-next-version 0.3.6

Ultra-fast version parsing and comparison with 117x performance improvement - core component of Rez-Next
Documentation
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
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
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
//! Tests for VersionRange — extracted from range.rs for file-size compliance.

#[cfg(test)]
mod tests {
    use crate::Version;
    use crate::range::VersionRange;

    fn v(s: &str) -> Version {
        Version::parse(s).unwrap()
    }

    #[test]
    fn test_version_range_any() {
        let range = VersionRange::parse("").unwrap();
        assert!(range.is_any());
        assert!(range.contains(&v("1.0.0")));
        assert!(range.contains(&v("99.0")));

        let range = VersionRange::parse("*").unwrap();
        assert!(range.is_any());
    }

    #[test]
    fn test_version_range_any_constructor() {
        let range = VersionRange::any();
        assert!(range.is_any(), "VersionRange::any() must report is_any()");
        assert!(range.contains(&v("0.0.1")));
        assert!(range.contains(&v("1.0.0")));
        assert!(range.contains(&v("99.99.99")));
        let specific = VersionRange::parse(">=1.0,<2.0").unwrap();
        let intersected = range
            .intersect(&specific)
            .expect("intersection with any must succeed");
        assert!(!intersected.contains(&v("0.9.0")));
        assert!(intersected.contains(&v("1.5.0")));
    }

    #[test]
    fn test_version_range_none_constructor() {
        let range = VersionRange::none();
        assert!(
            range.is_empty(),
            "VersionRange::none() must report is_empty()"
        );
        assert!(!range.contains(&v("1.0.0")));
        assert!(!range.contains(&v("0.0.1")));
        assert!(!range.contains(&v("99.0")));
        let specific = VersionRange::parse(">=1.0").unwrap();
        assert!(
            range.intersect(&specific).is_none(),
            "none intersect anything must be None"
        );
    }

    #[test]
    fn test_version_range_any_union_identity() {
        let any = VersionRange::any();
        let specific = VersionRange::parse("==1.0.0").unwrap();
        let unioned = any.union(&specific);
        assert!(unioned.contains(&v("1.0.0")));
        assert!(unioned.contains(&v("2.0.0")));
    }

    #[test]
    fn test_version_range_ge() {
        let range = VersionRange::parse(">=1.0.0").unwrap();
        assert!(range.contains(&v("1.0.0")));
        assert!(range.contains(&v("2.0.0")));
        assert!(!range.contains(&v("0.9.0")));
    }

    #[test]
    fn test_version_range_lt() {
        let range = VersionRange::parse("<2.0.0").unwrap();
        assert!(range.contains(&v("1.9.9")));
        assert!(!range.contains(&v("2.0.0")));
        assert!(!range.contains(&v("2.1.0")));
    }

    #[test]
    fn test_version_range_and() {
        let range = VersionRange::parse(">=1.0.0,<2.0.0").unwrap();
        assert!(range.contains(&v("1.0.0")));
        assert!(range.contains(&v("1.5.0")));
        assert!(!range.contains(&v("0.9.0")));
        assert!(!range.contains(&v("2.0.0")));
        assert!(!range.contains(&v("3.0.0")));
    }

    #[test]
    fn test_version_range_exact() {
        let range = VersionRange::parse("==1.0.0").unwrap();
        assert!(range.contains(&v("1.0.0")));
        assert!(!range.contains(&v("1.0.1")));
        assert!(!range.contains(&v("0.9.0")));
    }

    #[test]
    fn test_version_range_ne() {
        let range = VersionRange::parse("!=1.0.0").unwrap();
        assert!(!range.contains(&v("1.0.0")));
        assert!(range.contains(&v("1.0.1")));
        assert!(range.contains(&v("0.9.0")));
    }

    #[test]
    fn test_version_range_gt() {
        let range = VersionRange::parse(">1.0.0").unwrap();
        assert!(!range.contains(&v("1.0.0")));
        assert!(range.contains(&v("1.0.1")));
    }

    #[test]
    fn test_version_range_le() {
        let range = VersionRange::parse("<=2.0.0").unwrap();
        assert!(range.contains(&v("2.0.0")));
        assert!(range.contains(&v("1.0.0")));
        assert!(!range.contains(&v("2.0.1")));
    }

    #[test]
    fn test_version_range_or() {
        let range = VersionRange::parse("<1.0|>=2.0").unwrap();
        assert!(range.contains(&v("0.9.0")));
        assert!(range.contains(&v("2.0")));
        assert!(!range.contains(&v("1.5.0")));
    }

    #[test]
    fn test_version_range_compatible_release() {
        let range = VersionRange::parse("~=1.4.0").unwrap();
        assert!(range.contains(&v("1.4.0")));
        assert!(range.contains(&v("1.4.5")));
        assert!(!range.contains(&v("1.3.0")));
        assert!(!range.contains(&v("2.0.0")));
    }

    #[test]
    fn test_version_range_rez_plus_syntax() {
        let range = VersionRange::parse("1.0+").unwrap();
        assert!(range.contains(&v("1.0")));
        assert!(range.contains(&v("2.0")));
        assert!(!range.contains(&v("0.9")));
    }

    #[test]
    fn test_version_range_rez_plus_upper() {
        let range = VersionRange::parse("1.0+<2.0").unwrap();
        assert!(range.contains(&v("1.0")));
        assert!(range.contains(&v("1.5")));
        assert!(!range.contains(&v("2.0")));
        assert!(!range.contains(&v("0.9")));
    }

    #[test]
    fn test_version_range_intersect() {
        let r1 = VersionRange::parse(">=1.0.0").unwrap();
        let r2 = VersionRange::parse("<=2.0.0").unwrap();
        let intersection = r1.intersect(&r2).unwrap();
        assert!(intersection.contains(&v("1.5.0")));
    }

    #[test]
    fn test_version_range_union() {
        let r1 = VersionRange::parse(">=1.0.0,<1.5.0").unwrap();
        let r2 = VersionRange::parse(">=2.0.0").unwrap();
        let union = r1.union(&r2);
        assert!(union.contains(&v("1.2.0")));
        assert!(union.contains(&v("2.5.0")));
        assert!(!union.contains(&v("1.7.0")));
    }

    #[test]
    fn test_version_range_bare_version() {
        let range = VersionRange::parse("1.0.0").unwrap();
        assert!(range.contains(&v("1.0.0")));
        assert!(!range.contains(&v("1.0.1")));
    }

    #[test]
    fn test_is_empty() {
        let range = VersionRange::parse("empty").unwrap();
        assert!(range.is_empty());
        let range2 = VersionRange::parse("!*").unwrap();
        assert!(range2.is_empty());
    }

    #[test]
    fn test_space_separated_constraints() {
        let range = VersionRange::parse(">=1.0 <2.0").unwrap();
        assert!(range.contains(&v("1.5")));
        assert!(!range.contains(&v("2.0")));
        assert!(!range.contains(&v("0.9")));
    }

    #[test]
    fn test_is_subset_of_basic() {
        let r1 = VersionRange::parse(">=1.0,<2.0").unwrap();
        let r2 = VersionRange::parse(">=1.0").unwrap();
        assert!(r1.is_subset_of(&r2));
        assert!(!r2.is_subset_of(&r1));
    }

    #[test]
    fn test_is_superset_of_basic() {
        let r1 = VersionRange::parse(">=1.0").unwrap();
        let r2 = VersionRange::parse(">=1.0,<2.0").unwrap();
        assert!(r1.is_superset_of(&r2));
        assert!(!r2.is_superset_of(&r1));
    }

    #[test]
    fn test_is_subset_of_any() {
        let any = VersionRange::parse("*").unwrap();
        let r1 = VersionRange::parse(">=1.0").unwrap();
        assert!(r1.is_subset_of(&any));
        assert!(any.is_subset_of(&any));
    }

    #[test]
    fn test_is_subset_of_empty() {
        let empty = VersionRange::parse("empty").unwrap();
        let r1 = VersionRange::parse(">=1.0").unwrap();
        assert!(empty.is_subset_of(&r1));
        assert!(empty.is_subset_of(&empty));
    }

    #[test]
    fn test_subtract_basic() {
        let r1 = VersionRange::parse(">=1.0").unwrap();
        let r2 = VersionRange::parse(">=2.0").unwrap();
        let diff = r1.subtract(&r2);
        assert!(diff.is_some());
        let diff = diff.unwrap();
        assert!(diff.contains(&v("1.5")));
        assert!(!diff.contains(&v("2.5")));
    }

    #[test]
    fn test_subtract_any_gives_none() {
        let r1 = VersionRange::parse(">=1.0").unwrap();
        let any = VersionRange::parse("*").unwrap();
        assert!(r1.subtract(&any).is_none());
    }

    #[test]
    fn test_subtract_empty_gives_self() {
        let r1 = VersionRange::parse(">=1.0").unwrap();
        let empty = VersionRange::parse("empty").unwrap();
        let diff = r1.subtract(&empty);
        assert!(diff.is_some());
        let diff = diff.unwrap();
        assert!(diff.contains(&v("1.5")));
        assert!(diff.contains(&v("3.0")));
    }

    #[test]
    fn test_subset_exact_version() {
        let r1 = VersionRange::parse("==1.0").unwrap();
        let r2 = VersionRange::parse(">=1.0").unwrap();
        assert!(r1.is_subset_of(&r2));
        assert!(!r2.is_subset_of(&r1));
    }

    // ── intersect() returns new range ──────────────────────────────────────────

    #[test]
    fn test_intersect_overlapping_ranges() {
        let r1 = VersionRange::parse(">=1.0,<3.0").unwrap();
        let r2 = VersionRange::parse(">=2.0,<4.0").unwrap();
        let result = r1.intersect(&r2);
        assert!(
            result.is_some(),
            "Overlapping ranges should have intersection"
        );
        let inter = result.unwrap();
        assert!(inter.contains(&v("2.0")), "2.0 should be in intersection");
        assert!(inter.contains(&v("2.9")), "2.9 should be in intersection");
        assert!(
            !inter.contains(&v("1.5")),
            "1.5 should NOT be in intersection"
        );
        assert!(
            !inter.contains(&v("3.0")),
            "3.0 should NOT be in intersection"
        );
    }

    #[test]
    fn test_intersect_with_any() {
        let any = VersionRange::parse("*").unwrap();
        let r1 = VersionRange::parse(">=2.0,<5.0").unwrap();
        let result = any.intersect(&r1);
        assert!(result.is_some());
        let inter = result.unwrap();
        assert!(inter.contains(&v("3.0")));
        assert!(!inter.contains(&v("1.0")));
        let result2 = r1.intersect(&any);
        assert!(result2.is_some());
        let inter2 = result2.unwrap();
        assert!(inter2.contains(&v("3.0")));
    }

    #[test]
    fn test_intersect_exact_in_range() {
        let exact = VersionRange::parse("==2.5").unwrap();
        let range = VersionRange::parse(">=2.0,<3.0").unwrap();
        let result = exact.intersect(&range);
        assert!(result.is_some());
        let inter = result.unwrap();
        assert!(inter.contains(&v("2.5")));
        assert!(!inter.contains(&v("2.4")));
        assert!(!inter.contains(&v("2.6")));
    }

    #[test]
    fn test_intersect_exact_outside_range() {
        let exact = VersionRange::parse("==5.0").unwrap();
        let range = VersionRange::parse(">=1.0,<3.0").unwrap();
        let result = exact.intersect(&range);
        if let Some(ref inter) = result {
            assert!(
                !inter.contains(&v("5.0")),
                "5.0 should NOT be in intersection"
            );
            assert!(
                !inter.contains(&v("1.5")),
                "1.5 should NOT be in intersection"
            );
        }
    }

    #[test]
    fn test_intersect_disjoint_ranges() {
        let r1 = VersionRange::parse(">=1.0,<2.0").unwrap();
        let r2 = VersionRange::parse(">=3.0,<4.0").unwrap();
        let result = r1.intersect(&r2);
        if let Some(ref inter) = result {
            assert!(!inter.contains(&v("1.5")));
            assert!(!inter.contains(&v("3.5")));
        }
    }

    #[test]
    fn test_intersect_same_range() {
        let r = VersionRange::parse(">=1.0,<3.0").unwrap();
        let result = r.intersect(&r);
        assert!(result.is_some());
        let inter = result.unwrap();
        assert!(inter.contains(&v("1.5")));
        assert!(!inter.contains(&v("0.9")));
        assert!(!inter.contains(&v("3.0")));
    }

    #[test]
    fn test_intersect_with_ne() {
        let r1 = VersionRange::parse(">=1.0,<3.0").unwrap();
        let r2 = VersionRange::parse("!=2.0").unwrap();
        let result = r1.intersect(&r2);
        assert!(result.is_some());
        let inter = result.unwrap();
        assert!(inter.contains(&v("1.5")));
        assert!(!inter.contains(&v("2.0")));
        assert!(inter.contains(&v("2.5")));
    }

    #[test]
    fn test_intersect_or_range() {
        let r1 = VersionRange::parse("<1.0|>=3.0").unwrap();
        let r2 = VersionRange::parse(">=2.0").unwrap();
        let result = r1.intersect(&r2);
        assert!(result.is_some());
        let inter = result.unwrap();
        assert!(!inter.contains(&v("0.5")), "0.5 not in (<1|>=3) ∩ >=2");
        assert!(!inter.contains(&v("1.5")), "1.5 not in result");
        assert!(inter.contains(&v("3.5")), "3.5 should be in (<1|>=3) ∩ >=2");
    }

    #[test]
    fn test_intersect_compatible_release() {
        let r1 = VersionRange::parse("~=1.2").unwrap();
        let r2 = VersionRange::parse("<1.5").unwrap();
        let result = r1.intersect(&r2);
        assert!(result.is_some());
        let inter = result.unwrap();
        assert!(inter.contains(&v("1.3")));
        assert!(!inter.contains(&v("1.5")));
        assert!(!inter.contains(&v("1.0")));
    }

    #[test]
    fn test_intersect_returns_some_for_adjacent() {
        let r1 = VersionRange::parse(">=1.0,<2.0").unwrap();
        let r2 = VersionRange::parse(">=2.0,<3.0").unwrap();
        let result = r1.intersect(&r2);
        if let Some(ref inter) = result {
            assert!(!inter.contains(&v("1.5")), "1.5 not in r2");
            assert!(!inter.contains(&v("2.5")), "2.5 not in r1");
            assert!(!inter.contains(&v("2.0")), "2.0 not in r1 (strict <)");
        }
    }

    // ── intersects() method — boundary tests (Cycle 162) ────────────────────
    // These lock the Eq-vs-Ge/Lt fix from Cycle 161: before the fix,
    // `==3.9` intersects `>=3.9` returned false because the Ge bound was
    // compared with strict-less-than instead of less-than-or-equal.

    #[test]
    fn test_intersects_overlapping_ranges() {
        let r1 = VersionRange::parse(">=1.0,<3.0").unwrap();
        let r2 = VersionRange::parse(">=2.0,<4.0").unwrap();
        assert!(r1.intersects(&r2), ">=1,<3 must intersect >=2,<4");
        assert!(r2.intersects(&r1), "intersects must be symmetric");
    }

    #[test]
    fn test_intersects_disjoint_ranges() {
        let r1 = VersionRange::parse(">=1.0,<2.0").unwrap();
        let r2 = VersionRange::parse(">=3.0,<4.0").unwrap();
        assert!(!r1.intersects(&r2), ">=1,<2 must not intersect >=3,<4");
        assert!(!r2.intersects(&r1), "intersects must be symmetric");
    }

    #[test]
    fn test_intersects_eq_equals_ge_boundary() {
        // Regression for Cycle 161: ==3.9 ∩ >=3.9 was incorrectly returning false
        let eq = VersionRange::parse("==3.9").unwrap();
        let ge = VersionRange::parse(">=3.9").unwrap();
        assert!(
            eq.intersects(&ge),
            "==3.9 must intersect >=3.9 (boundary inclusive)"
        );
        assert!(
            ge.intersects(&eq),
            "intersects symmetric for eq/ge boundary"
        );
    }

    #[test]
    fn test_intersects_eq_below_ge_boundary() {
        // ==3.8 ∩ >=3.9 must be empty: 3.8 < 3.9 violates the lower bound
        let eq = VersionRange::parse("==3.8").unwrap();
        let ge = VersionRange::parse(">=3.9").unwrap();
        assert!(
            !eq.intersects(&ge),
            "==3.8 must not intersect >=3.9 (3.8 < lower bound)"
        );
    }

    #[test]
    fn test_intersects_eq_equals_lt_boundary() {
        // ==3.9 ∩ <3.9 must be empty: strict upper excludes 3.9 itself
        let eq = VersionRange::parse("==3.9").unwrap();
        let lt = VersionRange::parse("<3.9").unwrap();
        assert!(
            !eq.intersects(&lt),
            "==3.9 must not intersect <3.9 (strict upper bound)"
        );
    }

    #[test]
    fn test_intersects_eq_below_lt_boundary() {
        // ==3.8 ∩ <3.9 must intersect: 3.8 < 3.9 satisfies the upper bound
        let eq = VersionRange::parse("==3.8").unwrap();
        let lt = VersionRange::parse("<3.9").unwrap();
        assert!(
            eq.intersects(&lt),
            "==3.8 must intersect <3.9 (3.8 is within upper bound)"
        );
    }

    #[test]
    fn test_intersects_with_any_range() {
        let any = VersionRange::parse("").unwrap();
        let specific = VersionRange::parse(">=2.0,<3.0").unwrap();
        assert!(
            any.intersects(&specific),
            "any must intersect every specific range"
        );
        assert!(specific.intersects(&any), "intersects symmetric with any");
    }

    #[test]
    fn test_intersects_or_range_partial_overlap() {
        // (<1.0|>=3.0) ∩ >=2.0 should intersect via the >=3.0 arm
        let or_range = VersionRange::parse("<1.0|>=3.0").unwrap();
        let ge2 = VersionRange::parse(">=2.0").unwrap();
        assert!(
            or_range.intersects(&ge2),
            "(<1|>=3) must intersect >=2 via >=3 arm"
        );
    }

    #[test]
    fn test_intersects_or_range_no_overlap() {
        // (<1.0|>=5.0) ∩ >=2.0,<4.0 — the >=5 arm doesn't reach and <1 arm is below
        let or_range = VersionRange::parse("<1.0|>=5.0").unwrap();
        let mid = VersionRange::parse(">=2.0,<4.0").unwrap();
        assert!(
            !or_range.intersects(&mid),
            "(<1|>=5) must not intersect >=2,<4"
        );
    }
}