diff --git a/lib/clordle.dart b/lib/clordle.dart index 6ab0dbf..c62c850 100644 --- a/lib/clordle.dart +++ b/lib/clordle.dart @@ -1,3 +1 @@ -library clordle; - export 'src/src.dart'; diff --git a/lib/src/utils/keyboard.dart b/lib/src/utils/keyboard.dart index af25482..98fec8a 100644 --- a/lib/src/utils/keyboard.dart +++ b/lib/src/utils/keyboard.dart @@ -23,12 +23,12 @@ Iterable keyboard({ final closes = playedLetters.where((letter) => letter.status == LetterStatus.close); - const qwer = ['Q', 'W', 'E', 'R', 'T', 'Y', 'U', 'I', 'O', 'P']; - const asdf = ['A', 'S', 'D', 'F', 'G', 'H', 'J', 'K', 'L']; - const zxcv = ['Z', 'X', 'C', 'V', 'B', 'N', 'M']; + const qwerRow = ['Q', 'W', 'E', 'R', 'T', 'Y', 'U', 'I', 'O', 'P']; + const asdfRow = ['A', 'S', 'D', 'F', 'G', 'H', 'J', 'K', 'L']; + const zxcvRow = ['Z', 'X', 'C', 'V', 'B', 'N', 'M']; - final _qwer = keyboardRow( - qwer, + final qwer = keyboardRow( + qwerRow, close, hit, miss, @@ -36,8 +36,8 @@ Iterable keyboard({ misses: misses, closes: closes, ).join(' '); - final _asdf = keyboardRow( - asdf, + final asdf = keyboardRow( + asdfRow, close, hit, miss, @@ -45,8 +45,8 @@ Iterable keyboard({ misses: misses, closes: closes, ).join(' '); - final _zxcv = keyboardRow( - zxcv, + final zxcv = keyboardRow( + zxcvRow, close, hit, miss, @@ -56,9 +56,9 @@ Iterable keyboard({ ).join(' '); yield '┌─────────────────────┐'; - yield '│ $_qwer │'; - yield '│ $_asdf │'; - yield '│ $_zxcv │'; + yield '│ $qwer │'; + yield '│ $asdf │'; + yield '│ $zxcv │'; yield '└─────────────────────┘'; } diff --git a/pubspec.lock b/pubspec.lock index 42bf05d..65d7718 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -5,358 +5,393 @@ packages: dependency: transitive description: name: _fe_analyzer_shared - url: "https://pub.dartlang.org" + sha256: "569ddca58d535e601dd1584afa117710abc999d036c0cd2c51777fb257df78e8" + url: "https://pub.dev" source: hosted - version: "38.0.0" + version: "53.0.0" analyzer: dependency: transitive description: name: analyzer - url: "https://pub.dartlang.org" + sha256: "10927c4b7c7c88b1adbca278c3d5531db92e2f4b4abf04e2919a800af965f3f5" + url: "https://pub.dev" source: hosted - version: "3.4.1" + version: "5.5.0" args: dependency: "direct main" description: name: args - url: "https://pub.dartlang.org" + sha256: "4cab82a83ffef80b262ddedf47a0a8e56ee6fbf7fe21e6e768b02792034dd440" + url: "https://pub.dev" source: hosted - version: "2.3.0" + version: "2.4.0" async: dependency: transitive description: name: async - url: "https://pub.dartlang.org" + sha256: bfe67ef28df125b7dddcea62755991f807aa39a2492a23e1550161692950bbe0 + url: "https://pub.dev" source: hosted - version: "2.8.2" + version: "2.10.0" boolean_selector: dependency: transitive description: name: boolean_selector - url: "https://pub.dartlang.org" + sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66" + url: "https://pub.dev" source: hosted - version: "2.1.0" - charcode: - dependency: transitive - description: - name: charcode - url: "https://pub.dartlang.org" - source: hosted - version: "1.3.1" + version: "2.1.1" collection: dependency: transitive description: name: collection - url: "https://pub.dartlang.org" + sha256: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c" + url: "https://pub.dev" source: hosted - version: "1.16.0" + version: "1.17.1" convert: dependency: transitive description: name: convert - url: "https://pub.dartlang.org" + sha256: "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592" + url: "https://pub.dev" source: hosted - version: "3.0.1" + version: "3.1.1" coverage: dependency: transitive description: name: coverage - url: "https://pub.dartlang.org" + sha256: "2fb815080e44a09b85e0f2ca8a820b15053982b2e714b59267719e8a9ff17097" + url: "https://pub.dev" source: hosted - version: "1.2.0" + version: "1.6.3" crypto: dependency: transitive description: name: crypto - url: "https://pub.dartlang.org" + sha256: aa274aa7774f8964e4f4f38cc994db7b6158dd36e9187aaceaddc994b35c6c67 + url: "https://pub.dev" source: hosted - version: "3.0.1" + version: "3.0.2" equatable: dependency: "direct main" description: name: equatable - url: "https://pub.dartlang.org" + sha256: c2b87cb7756efdf69892005af546c56c0b5037f54d2a88269b4f347a505e3ca2 + url: "https://pub.dev" source: hosted - version: "2.0.3" + version: "2.0.5" file: dependency: transitive description: name: file - url: "https://pub.dartlang.org" + sha256: "1b92bec4fc2a72f59a8e15af5f52cd441e4a7860b49499d69dfa817af20e925d" + url: "https://pub.dev" source: hosted - version: "6.1.2" + version: "6.1.4" frontend_server_client: dependency: transitive description: name: frontend_server_client - url: "https://pub.dartlang.org" + sha256: "408e3ca148b31c20282ad6f37ebfa6f4bdc8fede5b74bc2f08d9d92b55db3612" + url: "https://pub.dev" source: hosted - version: "2.1.2" + version: "3.2.0" glob: dependency: transitive description: name: glob - url: "https://pub.dartlang.org" + sha256: "4515b5b6ddb505ebdd242a5f2cc5d22d3d6a80013789debfbda7777f47ea308c" + url: "https://pub.dev" source: hosted - version: "2.0.2" + version: "2.1.1" http_multi_server: dependency: transitive description: name: http_multi_server - url: "https://pub.dartlang.org" + sha256: "97486f20f9c2f7be8f514851703d0119c3596d14ea63227af6f7a481ef2b2f8b" + url: "https://pub.dev" source: hosted - version: "3.2.0" + version: "3.2.1" http_parser: dependency: transitive description: name: http_parser - url: "https://pub.dartlang.org" + sha256: "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b" + url: "https://pub.dev" source: hosted - version: "4.0.0" + version: "4.0.2" io: dependency: transitive description: name: io - url: "https://pub.dartlang.org" + sha256: "2ec25704aba361659e10e3e5f5d672068d332fc8ac516421d483a11e5cbd061e" + url: "https://pub.dev" source: hosted - version: "1.0.3" + version: "1.0.4" js: dependency: transitive description: name: js - url: "https://pub.dartlang.org" + sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3 + url: "https://pub.dev" source: hosted - version: "0.6.4" + version: "0.6.7" logging: dependency: transitive description: name: logging - url: "https://pub.dartlang.org" + sha256: "04094f2eb032cbb06c6f6e8d3607edcfcb0455e2bb6cbc010cb01171dcb64e6d" + url: "https://pub.dev" source: hosted - version: "1.0.2" + version: "1.1.1" mason_logger: dependency: "direct main" description: name: mason_logger - url: "https://pub.dartlang.org" + sha256: ca34d14e998cd7a7738e7320b102aa45fb363aa49a290084b211ababf75bb7ee + url: "https://pub.dev" source: hosted - version: "0.1.0-dev.6" + version: "0.2.5" matcher: dependency: transitive description: name: matcher - url: "https://pub.dartlang.org" + sha256: c94db23593b89766cda57aab9ac311e3616cf87c6fa4e9749df032f66f30dcb8 + url: "https://pub.dev" source: hosted - version: "0.12.11" + version: "0.12.14" meta: dependency: "direct main" description: name: meta - url: "https://pub.dartlang.org" + sha256: "12307e7f0605ce3da64cf0db90e5fcab0869f3ca03f76be6bb2991ce0a55e82b" + url: "https://pub.dev" source: hosted - version: "1.7.0" + version: "1.9.0" mime: dependency: transitive description: name: mime - url: "https://pub.dartlang.org" + sha256: e4ff8e8564c03f255408decd16e7899da1733852a9110a58fe6d1b817684a63e + url: "https://pub.dev" source: hosted - version: "1.0.1" + version: "1.0.4" mocktail: dependency: "direct dev" description: name: mocktail - url: "https://pub.dartlang.org" + sha256: "80a996cd9a69284b3dc521ce185ffe9150cde69767c2d3a0720147d93c0cef53" + url: "https://pub.dev" source: hosted version: "0.3.0" node_preamble: dependency: transitive description: name: node_preamble - url: "https://pub.dartlang.org" + sha256: "8ebdbaa3b96d5285d068f80772390d27c21e1fa10fb2df6627b1b9415043608d" + url: "https://pub.dev" source: hosted version: "2.0.1" package_config: dependency: transitive description: name: package_config - url: "https://pub.dartlang.org" + sha256: "1c5b77ccc91e4823a5af61ee74e6b972db1ef98c2ff5a18d3161c982a55448bd" + url: "https://pub.dev" source: hosted - version: "2.0.2" + version: "2.1.0" path: dependency: transitive description: name: path - url: "https://pub.dartlang.org" + sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917" + url: "https://pub.dev" source: hosted - version: "1.8.1" + version: "1.8.3" pool: dependency: transitive description: name: pool - url: "https://pub.dartlang.org" + sha256: "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a" + url: "https://pub.dev" source: hosted - version: "1.5.0" + version: "1.5.1" pub_semver: dependency: transitive description: name: pub_semver - url: "https://pub.dartlang.org" + sha256: "307de764d305289ff24ad257ad5c5793ce56d04947599ad68b3baa124105fc17" + url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.3" shelf: dependency: transitive description: name: shelf - url: "https://pub.dartlang.org" + sha256: c24a96135a2ccd62c64b69315a14adc5c3419df63b4d7c05832a346fdb73682c + url: "https://pub.dev" source: hosted - version: "1.2.0" + version: "1.4.0" shelf_packages_handler: dependency: transitive description: name: shelf_packages_handler - url: "https://pub.dartlang.org" + sha256: aef74dc9195746a384843102142ab65b6a4735bb3beea791e63527b88cc83306 + url: "https://pub.dev" source: hosted - version: "3.0.0" + version: "3.0.1" shelf_static: dependency: transitive description: name: shelf_static - url: "https://pub.dartlang.org" + sha256: e792b76b96a36d4a41b819da593aff4bdd413576b3ba6150df5d8d9996d2e74c + url: "https://pub.dev" source: hosted - version: "1.1.0" + version: "1.1.1" shelf_web_socket: dependency: transitive description: name: shelf_web_socket - url: "https://pub.dartlang.org" + sha256: a988c0e8d8ffbdb8a28aa7ec8e449c260f3deb808781fe1284d22c5bba7156e8 + url: "https://pub.dev" source: hosted - version: "1.0.1" + version: "1.0.3" source_map_stack_trace: dependency: transitive description: name: source_map_stack_trace - url: "https://pub.dartlang.org" + sha256: "84cf769ad83aa6bb61e0aa5a18e53aea683395f196a6f39c4c881fb90ed4f7ae" + url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "2.1.1" source_maps: dependency: transitive description: name: source_maps - url: "https://pub.dartlang.org" + sha256: "708b3f6b97248e5781f493b765c3337db11c5d2c81c3094f10904bfa8004c703" + url: "https://pub.dev" source: hosted - version: "0.10.10" + version: "0.10.12" source_span: dependency: transitive description: name: source_span - url: "https://pub.dartlang.org" + sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250 + url: "https://pub.dev" source: hosted - version: "1.8.2" + version: "1.9.1" stack_trace: dependency: transitive description: name: stack_trace - url: "https://pub.dartlang.org" + sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5 + url: "https://pub.dev" source: hosted - version: "1.10.0" + version: "1.11.0" stream_channel: dependency: transitive description: name: stream_channel - url: "https://pub.dartlang.org" + sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8" + url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "2.1.1" string_scanner: dependency: transitive description: name: string_scanner - url: "https://pub.dartlang.org" + sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde" + url: "https://pub.dev" source: hosted - version: "1.1.0" + version: "1.2.0" term_glyph: dependency: transitive description: name: term_glyph - url: "https://pub.dartlang.org" + sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84 + url: "https://pub.dev" source: hosted - version: "1.2.0" + version: "1.2.1" test: dependency: "direct dev" description: name: test - url: "https://pub.dartlang.org" + sha256: "5301f54eb6fe945daa99bc8df6ece3f88b5ceaa6f996f250efdaaf63e22886be" + url: "https://pub.dev" source: hosted - version: "1.20.2" + version: "1.23.1" test_api: dependency: transitive description: name: test_api - url: "https://pub.dartlang.org" + sha256: "6182294da5abf431177fccc1ee02401f6df30f766bc6130a0852c6b6d7ee6b2d" + url: "https://pub.dev" source: hosted - version: "0.4.9" + version: "0.4.18" test_core: dependency: transitive description: name: test_core - url: "https://pub.dartlang.org" + sha256: d2e9240594b409565524802b84b7b39341da36dd6fd8e1660b53ad928ec3e9af + url: "https://pub.dev" source: hosted - version: "0.4.11" + version: "0.4.24" typed_data: dependency: transitive description: name: typed_data - url: "https://pub.dartlang.org" + sha256: "26f87ade979c47a150c9eaab93ccd2bebe70a27dc0b4b29517f2904f04eb11a5" + url: "https://pub.dev" source: hosted - version: "1.3.0" - universal_io: - dependency: transitive - description: - name: universal_io - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.4" + version: "1.3.1" very_good_analysis: dependency: "direct dev" description: name: very_good_analysis - url: "https://pub.dartlang.org" + sha256: ebc48c51db35beeeec8c414e32f7bd78e612bd7f5992ccb0d46e19edaeb40b08 + url: "https://pub.dev" source: hosted - version: "2.4.0" + version: "4.0.0+1" vm_service: dependency: transitive description: name: vm_service - url: "https://pub.dartlang.org" + sha256: a4040e9852e56bf8a3c5a2e08a56f6facd76e75500cf2a922ce5d52394c4998a + url: "https://pub.dev" source: hosted - version: "8.2.2" + version: "11.0.1" watcher: dependency: transitive description: name: watcher - url: "https://pub.dartlang.org" + sha256: "6a7f46926b01ce81bfc339da6a7f20afbe7733eff9846f6d6a5466aa4c6667c0" + url: "https://pub.dev" source: hosted - version: "1.0.1" + version: "1.0.2" web_socket_channel: dependency: transitive description: name: web_socket_channel - url: "https://pub.dartlang.org" + sha256: ca49c0bc209c687b887f30527fb6a9d80040b072cc2990f34b9bec3e7663101b + url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "2.3.0" webkit_inspection_protocol: dependency: transitive description: name: webkit_inspection_protocol - url: "https://pub.dartlang.org" + sha256: "67d3a8b6c79e1987d19d848b0892e582dbb0c66c57cc1fef58a177dd2aa2823d" + url: "https://pub.dev" source: hosted - version: "1.0.0" + version: "1.2.0" yaml: dependency: transitive description: name: yaml - url: "https://pub.dartlang.org" + sha256: "23812a9b125b48d4007117254bca50abb6c712352927eece9e155207b1db2370" + url: "https://pub.dev" source: hosted - version: "3.1.0" + version: "3.1.1" sdks: - dart: ">=2.16.1 <3.0.0" + dart: ">=2.19.0 <4.0.0" diff --git a/pubspec.yaml b/pubspec.yaml index e6a7524..2440bf4 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -4,17 +4,17 @@ version: 0.0.1-dev.3 repository: https://github.com/Luckey-Elijah/clordle environment: - sdk: '>=2.16.1 <3.0.0' + sdk: '>=2.19.0 <3.0.0' dev_dependencies: mocktail: ^0.3.0 test: ^1.16.0 - very_good_analysis: ^2.4.0 + very_good_analysis: ^4.0.0+1 dependencies: args: ^2.3.0 equatable: ^2.0.3 - mason_logger: ^0.1.0-dev.6 + mason_logger: ^0.2.5 meta: ^1.7.0 executables: diff --git a/test/src/utils/gameboard_test.dart b/test/src/utils/gameboard_test.dart index b467464..f83a186 100644 --- a/test/src/utils/gameboard_test.dart +++ b/test/src/utils/gameboard_test.dart @@ -59,28 +59,28 @@ void main() { }); test('[gameboardRow] generates a row', () { - String _nil(String _) => _; + String nil(String _) => _; final fiveUnmatchedX = Word( List.generate(5, (_) => const Letter(LetterStatus.unmatched, 'X')), ); - var actual = gameboardRow(fiveUnmatchedX, _nil, _nil).join(); + var actual = gameboardRow(fiveUnmatchedX, nil, nil).join(); expect(actual, '│ X │ X │ X │ X │ X │'); - actual = gameboardRow(const Word([]), _nil, _nil).join(); + actual = gameboardRow(const Word([]), nil, nil).join(); expect(actual, '│'); actual = gameboardRow( const Word([Letter(LetterStatus.hit, 'X')]), - _nil, - _nil, + nil, + nil, ).join(); expect(actual, '│ X │'); actual = gameboardRow( const Word([Letter(LetterStatus.close, 'X')]), - _nil, - _nil, + nil, + nil, ).join(); expect(actual, '│ X │'); }); diff --git a/test/src/utils/keyboard_test.dart b/test/src/utils/keyboard_test.dart index 2a1d92c..e6f9d04 100644 --- a/test/src/utils/keyboard_test.dart +++ b/test/src/utils/keyboard_test.dart @@ -49,13 +49,13 @@ void main() { }); test('keyboardRow', () { - String _nil(String _) => _; + String nil(String _) => _; expect( keyboardRow( ['Q'], - _nil, - _nil, - _nil, + nil, + nil, + nil, closes: [const Letter(LetterStatus.unmatched, 'Q')], ).join(), 'Q', @@ -64,9 +64,9 @@ void main() { expect( keyboardRow( ['Q'], - _nil, - _nil, - _nil, + nil, + nil, + nil, misses: [const Letter(LetterStatus.unmatched, 'Q')], ).join(), 'Q', @@ -75,9 +75,9 @@ void main() { expect( keyboardRow( ['Q'], - _nil, - _nil, - _nil, + nil, + nil, + nil, hits: [const Letter(LetterStatus.unmatched, 'Q')], ).join(), 'Q', diff --git a/test/src/utils/string_stylers_test.dart b/test/src/utils/string_stylers_test.dart index 80f6e2f..d9178ff 100644 --- a/test/src/utils/string_stylers_test.dart +++ b/test/src/utils/string_stylers_test.dart @@ -1,18 +1,19 @@ import 'package:clordle/clordle.dart'; +import 'package:mason_logger/mason_logger.dart'; import 'package:test/test.dart'; void main() { group('string stylers', () { test('hit', () { - expect(hit('value'), 'value'); + expect(hit('value'), styleBold.wrap(green.wrap('value'))); }); test('miss', () { - expect(miss('value'), 'value'); + expect(miss('value'), styleBold.wrap(red.wrap('value'))); }); test('close', () { - expect(close('value'), 'value'); + expect(close('value'), styleBold.wrap(yellow.wrap('value'))); }); }); }