Update to Dart 3 and bump to 0.4.0

fluttercommunity · Nov 20, 2023 · 972c17b · 972c17b
1 parent d368e63
commit 972c17b
Show file tree

Hide file tree

Showing 9 changed files with 44 additions and 44 deletions.
diff --git a/.github/workflows/analyze.yml b/.github/workflows/analyze.yml
@@ -2,9 +2,9 @@ name: analyze
 
 on:
   push:
-    branches: [ master ]
+    branches: [ main ]
   pull_request:
-    branches: [ master ]
+    branches: [ main ]
 
 jobs:
   package-analysis:

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -2,9 +2,9 @@ name: build
 
 on:
   push:
-    branches: [ master ]
+    branches: [ main ]
   pull_request:
-    branches: [ master ]
+    branches: [ main ]
 
 jobs:
   build:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## [0.4.0] - 2023-11-20
+
+* Migrated to Dart 3 (thanks @slightfoot)
+
 ## [0.3.0] - 2021-04-22
 
 * Migrated to null-safety (thanks @scarnett!)

diff --git a/README.md b/README.md
@@ -2,8 +2,8 @@
 
 [![pub](https://img.shields.io/pub/v/interval_tree.svg)](https://pub.dev/packages/interval_tree)
 [![license: MIT](https://img.shields.io/badge/license-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
-![build](https://github.com/jpnurmi/interval_tree/workflows/build/badge.svg)
-[![codecov](https://codecov.io/gh/jpnurmi/interval_tree/branch/main/graph/badge.svg)](https://codecov.io/gh/jpnurmi/interval_tree)
+[![build](https://github.com/fluttercommunity/interval_tree/actions/workflows/build.yml/badge.svg)](https://github.com/fluttercommunity/interval_tree/actions/workflows/build.yml)
+[![codecov](https://codecov.io/gh/fluttercommunity/interval_tree/branch/main/graph/badge.svg)](https://codecov.io/gh/fluttercommunity/interval_tree)
 
 A [Dart][1] implementation of an [interval tree][2], with support for
 calculating unions, intersections, and differences between individual

diff --git a/analysis_options.yaml b/analysis_options.yaml
@@ -0,0 +1 @@
+include: package:lints/recommended.yaml
diff --git a/lib/interval_tree.dart b/lib/interval_tree.dart
@@ -84,7 +84,7 @@ import 'package:quiver/collection.dart';
 ///     final interval = ivt.Interval(1, 2);
 ///
 @immutable
-class Interval extends Comparable<Interval> {
+class Interval implements Comparable<Interval> {
   /// Creates an interval between [start] and [end] points.
   Interval(dynamic start, dynamic end)
       : _start = _min(start, end),
@@ -101,10 +101,6 @@ class Interval extends Comparable<Interval> {
   /// Returns the end point of this interval.
   dynamic get end => _end;
 
-  /// Returns the length of this interval.
-  @deprecated
-  dynamic get length => _end - _start;
-
   /// Returns `true` if this interval contains the [other] interval.
   bool contains(Interval other) => other.start >= start && other.end <= end;
 
@@ -247,7 +243,9 @@ class Interval extends Comparable<Interval> {
   String toString() => '[$start, $end]';
 
   static int _cmp(dynamic a, dynamic b) => Comparable.compare(a, b);
+
   static dynamic _min(dynamic a, dynamic b) => _cmp(a, b) < 0 ? a : b;
+
   static dynamic _max(dynamic a, dynamic b) => _cmp(a, b) > 0 ? a : b;
 
   final dynamic _start;
@@ -327,13 +325,15 @@ class IntervalTree with IterableMixin<Interval> {
   factory IntervalTree.of(Iterable<Interval?> intervals) =>
       IntervalTree()..addAll(intervals);
 
+  final _tree = AvlTreeSet<Interval>(comparator: Comparable.compare);
+
   /// Adds an [interval] into this tree.
-  void add(dynamic? interval) {
-    Interval? iv = _asInterval(interval);
+  void add(dynamic interval) {
+    var iv = _asInterval(interval);
     if (iv == null) return;
 
     bool joined = false;
-    BidirectionalIterator<Interval?> it = _tree.fromIterator(iv);
+    var it = _tree.fromIterator(iv);
     while (it.movePrevious()) {
       final union = _tryJoin(it.current, iv);
       if (union == null) break;
@@ -365,7 +365,7 @@ class IntervalTree with IterableMixin<Interval> {
   void remove(dynamic interval) {
     final iv = _asInterval(interval);
 
-    BidirectionalIterator<Interval> it = _tree.fromIterator(iv!);
+    var it = _tree.fromIterator(iv!);
     while (it.movePrevious()) {
       final current = it.current;
       if (!_trySplit(it.current, iv)) break;
@@ -405,7 +405,7 @@ class IntervalTree with IterableMixin<Interval> {
     final result = IntervalTree();
     if (isEmpty || other.isEmpty) result;
     for (final iv in other) {
-      BidirectionalIterator<Interval> it = _tree.fromIterator(iv);
+      var it = _tree.fromIterator(iv);
       while (it.movePrevious() && iv.intersects(it.current)) {
         result.add(iv.intersection(it.current));
       }
@@ -418,15 +418,15 @@ class IntervalTree with IterableMixin<Interval> {
   }
 
   @override
-  bool contains(dynamic interval) {
-    final iv = _asInterval(interval);
-    BidirectionalIterator<Interval?> it = _tree.fromIterator(iv!);
-    while (it.movePrevious() && iv.intersects(it.current!)) {
-      if (it.current!.contains(iv)) return true;
+  bool contains(Object? element) {
+    final iv = _asInterval(element);
+    var it = _tree.fromIterator(iv!);
+    while (it.movePrevious() && iv.intersects(it.current)) {
+      if (it.current.contains(iv)) return true;
     }
     it = _tree.fromIterator(iv, inclusive: false);
-    while (it.moveNext() && it.current!.intersects(iv)) {
-      if (it.current!.contains(iv)) return true;
+    while (it.moveNext() && it.current.intersects(iv)) {
+      if (it.current.contains(iv)) return true;
     }
     return false;
   }
@@ -457,13 +457,13 @@ class IntervalTree with IterableMixin<Interval> {
 
   /// Returns a bidirectional iterator that allows iterating the intervals.
   @override
-  BidirectionalIterator<Interval> get iterator => _tree.iterator;
+  TreeIterator<Interval> get iterator => _tree.iterator;
 
   /// Returns a string representation of the tree.
   @override
-  String toString() => 'IntervalTree' + super.toString();
+  String toString() => 'IntervalTree${super.toString()}';
 
-  Interval? _asInterval(dynamic? interval) {
+  Interval? _asInterval(dynamic interval) {
     if (interval is Iterable) {
       if (interval.length != 2 || interval.first is Iterable) {
         throw ArgumentError('$interval is not an interval');
@@ -490,7 +490,4 @@ class IntervalTree with IterableMixin<Interval> {
     _tree.addAll([...?a.difference(b)]);
     return true;
   }
-
-  final AvlTreeSet<Interval> _tree =
-      AvlTreeSet<Interval>(comparator: Comparable.compare);
 }
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,18 +1,21 @@
 name: interval_tree
-version: 0.3.0
+version: 0.4.0
 description: >-
   A non-overlapping interval tree with support for calculating unions,
   intersections, and differences between individual intervals and entire
   trees.
-homepage: https://github.com/jpnurmi/interval_tree
-repository: https://github.com/jpnurmi/interval_tree
-issue_tracker: https://github.com/jpnurmi/interval_tree/issues
+homepage: https://github.com/fluttercommunity/interval_tree
+repository: https://github.com/fluttercommunity/interval_tree
+issue_tracker: https://github.com/fluttercommunity/interval_tree/issues
 
 environment:
-  sdk: '>=2.12.0 <3.0.0'
+  sdk: '>=3.0.0 <4.0.0'
+
 dependencies:
-  meta: ^1.1.8
-  quiver: ^3.0.1
+  lints: ^3.0.0
+  meta: ^1.11.0
+  quiver: ^3.2.1
+
 dev_dependencies:
-  test: ^1.14.2
+  test: ^1.24.3
   test_cov: ^1.0.1
diff --git a/test/interval_test.dart b/test/interval_test.dart
@@ -39,13 +39,6 @@ void main() {
     expect(Interval(1, -10).end, 1);
   });
 
-  test('length', () {
-    expect(Interval(0, 0).length, 0);
-    expect(Interval(-1, 1).length, 2);
-    expect(Interval(1, 10).length, 9);
-    expect(Interval(1, -10).length, 11);
-  });
-
   test('copy', () {
     final interval = Interval(0, 10);
     final copy = Interval.copy(interval);

diff --git a/test/interval_tree_test.dart b/test/interval_tree_test.dart
@@ -1,3 +1,5 @@
+// ignore_for_file: collection_methods_unrelated_type
+
 /*
  * Copyright (c) 2020 J-P Nurmi <[email protected]>
  *