Merge pull request #27 from Hasilt/dart_3_support

Dart 3 support

Author: comigor

.github/workflows/pull_request.yaml

@@ -17,7 +17,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: dart-lang/[email protected]
         with:
-          sdk: 2.12.0
+          sdk: stable
       - id: install
         name: Install dependencies
         run: dart pub get

.github/workflows/push.yaml

@@ -13,7 +13,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: dart-lang/[email protected]
         with:
-          sdk: 2.12.0
+          sdk: stable
       - id: install
         name: Install dependencies
         run: dart pub get

CHANGELOG.md

@@ -1,5 +1,8 @@
 # CHANGELOG
 
+## 0.5.0
+- Dart 3 support added.
+
 ## 0.4.1
 - Update the CI
 

example/pubspec.yaml

@@ -1,11 +1,9 @@
 name: fuzzy_example
-version: 0.0.1
+version: 0.0.2
 
-authors:
-  - Igor Borges <[email protected]>
 
 environment:
-  sdk: '>=2.0.0 <3.0.0'
+  sdk: '>=3.0.3 <4.0.0'
 
 publish_to: none
 

lib/bitap/bitap.dart

@@ -1,4 +1,4 @@
-import 'package:latinize/latinize.dart';
+import 'package:stringr/stringr.dart';
 import '../data/fuzzy_options.dart';
 import 'bitap_pattern_alphabet.dart' as pa;
 import 'bitap_search.dart';
@@ -20,7 +20,7 @@ class Bitap {
   Bitap(String pattern, {required FuzzyOptions options}) : options = options {
     this.pattern = options.isCaseSensitive ? pattern : pattern.toLowerCase();
     this.pattern =
-        options.shouldNormalize ? latinize(this.pattern) : this.pattern;
+        options.shouldNormalize ? this.pattern.latinize() : this.pattern;
     if (pattern.length <= options.maxPatternLength) {
       patternAlphabet = pa.patternAlphabet(this.pattern);
     }
@@ -41,7 +41,7 @@ class Bitap {
       text = text.toLowerCase();
     }
     if (options.shouldNormalize) {
-      text = latinize(text);
+      text = text.latinize();
     }
 
     // Exact match

lib/fuzzy.dart

@@ -156,7 +156,7 @@ class Fuzzy<T> {
     var numTextMatches = 0;
 
     final mainSearchResult = fullSearcher.search(value.toString());
-    _log('Full text: "${value}", score: ${mainSearchResult.score}');
+    _log('Full text: "$value", score: ${mainSearchResult.score}');
 
     if (options.tokenize) {
       final words = value.toString().split(options.tokenSeparator);
@@ -181,7 +181,7 @@ class Fuzzy<T> {
               scores.add(1);
             }
           }
-          _log('Token: "${word}", score: ${tokenSearchResult.score}');
+          _log('Token: "$word", score: ${tokenSearchResult.score}');
         }
 
         if (hasMatchInText) {
@@ -206,7 +206,7 @@ class Fuzzy<T> {
         ? numTextMatches >= tokenSearchers.length
         : true;
 
-    _log('\nCheck Matches: ${checkTextMatches}');
+    _log('\nCheck Matches: $checkTextMatches');
 
     // If a match is found, add the item to <rawResults>, including its score
     if ((exists || mainSearchResult.isMatch) && checkTextMatches) {

pubspec.yaml

@@ -1,16 +1,16 @@
 name: fuzzy
-version: 0.4.1
+version: 0.5.0
 
 description: >
   Fuzzy search in Dart. Initially a code conversion, subset of Fuse.js.
 homepage: https://github.com/comigor/fuzzy
 
 environment:
-  sdk: ">=2.12.0-0.dev <3.0.0"
+  sdk: '>=3.0.3 <4.0.0'
 
 dependencies:
-  latinize: ^0.1.0-nullsafety
+  stringr: ^1.0.0
 
 dev_dependencies:
-  test: ^1.16.0-nullsafety
-  pedantic: ^1.10.0-nullsafety
+  test: ^1.24.6-nullsafety
+  pedantic: ^1.11.1-nullsafety