Skip to content

fix: Fix extra-packages CLI parameters to be multi-option #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Apr 14, 2025
Merged

fix: Fix extra-packages CLI parameters to be multi-option #16

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7b23943
chore: Update dependency versions
luanpotter Apr 13, 2025
51838b6
Bump more versions
luanpotter Apr 13, 2025
09ebff9
fix: Fix extra-packages CLI parameters to be multi-option
luanpotter Apr 13, 2025
903eaf7
Merge branch 'main' into luan.fix-12
spydon Apr 14, 2025
c4b9406
Update lib/utils.dart
luanpotter Apr 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/main.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ Future<void> mainCommand(List<String> args) async {
help: 'What Flame version you would like to use.',
allowed: flameVersions.versions,
);
create.addOption(
create.addMultiOption(
'extra-packages',
help: 'Which packages to use',
allowed: packages.keys.map((e) => e.name).toList(),
Expand Down
25 changes: 23 additions & 2 deletions lib/utils.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,22 @@ String getOption(
return value;
}

List<String> _unwrap(dynamic value) {
if (value == null) {
return [];
} else if (value is String) {
return [value];
} else if (value is List<String>) {
return value;
} else if (value is List) {
return value.map((e) => e.toString()).toList();
} else {
throw ArgumentError(
'Invalid type for value (${value.runtimeType}): $value',
);
}
}

List<String> getMultiOption(
ArgResults results,
String name,
Expand All @@ -85,7 +101,7 @@ List<String> getMultiOption(
List<String> startingOptions = const [],
String? desc,
}) {
var value = results[name] as List<String>? ?? [];
var value = _unwrap(results[name]);
if (!isInteractive) {
if (value.isEmpty) {
if (startingOptions.isNotEmpty) {
Expand All @@ -94,6 +110,8 @@ List<String> getMultiOption(
print('Missing parameter $name is required.');
exit(1);
}
} else {
return value;
}
}
if (value.any((e) => !options.contains(e))) {
Expand All @@ -103,7 +121,10 @@ List<String> getMultiOption(
if (desc != null) {
stdout.write(ansi.darkGray.wrap('\n$desc\u{1B}[1A\r'));
}
value = cbx(message, options, startingOptions);
final selectedOptions = value.isEmpty
? startingOptions
: value;
value = cbx(message, options, selectedOptions);
if (desc != null) {
stdout.write('\r\u{1B}[K');
}
Expand Down