Skip to content

Commit 9b7b064

Browse files
committed
style: improve code formatting and readability in EnvPlaceholder and Placeholder classes
1 parent 507cd90 commit 9b7b064

File tree

2 files changed

+52
-39
lines changed

2 files changed

+52
-39
lines changed

lib/src/infrastructure/services/placeholder/env_placeholder.dart

Lines changed: 20 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -16,26 +16,31 @@ final class EnvPlaceholder implements PlaceholderContract {
1616
}
1717

1818
void _injectEntryMap(String identifier, Map<String, dynamic> values) {
19-
final mapEntry = Map<String, dynamic>.from(values.map((key, value) {
20-
final currentKey = key.snakeCase.toUpperCase();
21-
return MapEntry('$identifier.$currentKey', value);
22-
}));
19+
final mapEntry = Map<String, dynamic>.from(
20+
values.map((key, value) {
21+
final currentKey = key.snakeCase.toUpperCase();
22+
return MapEntry('$identifier.$currentKey', value);
23+
}),
24+
);
2325

2426
_values.addAll(mapEntry);
2527
}
2628

2729
@override
2830
String apply(String value) {
29-
return values.entries.fold(value, (acc, element) {
30-
final finalValue = switch (element.value) {
31-
String() => element.value,
32-
int() => element.value.toString(),
33-
_ => throw Exception('Invalid type')
34-
};
35-
36-
return acc
37-
.replaceAll('{${element.key}}', finalValue)
38-
.replaceAll('{{ ${element.key} }}', finalValue);
39-
});
31+
return values.entries.fold(
32+
value,
33+
(acc, element) {
34+
final finalValue = switch (element.value) {
35+
String() => element.value,
36+
int() => element.value.toString(),
37+
_ => throw Exception('Invalid type')
38+
};
39+
40+
return acc
41+
.replaceAll('{${element.key}}', finalValue)
42+
.replaceAll('{{ ${element.key} }}', finalValue);
43+
},
44+
);
4045
}
4146
}

lib/src/infrastructure/services/placeholder/placeholder.dart

Lines changed: 32 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,18 @@ class Placeholder implements PlaceholderContract {
2121
}
2222

2323
void _injectEntryMap(String? identifier, Map<String, dynamic> values) {
24-
final mapEntry = Map<String, dynamic>.from(values.map((key, value) {
25-
final hasIdentifier = key.contains('.');
26-
final finalKey = !hasIdentifier
27-
? identifier != null
28-
? '$identifier.$key'
29-
: key
30-
: key;
24+
final mapEntry = Map<String, dynamic>.from(
25+
values.map((key, value) {
26+
final hasIdentifier = key.contains('.');
27+
final finalKey = !hasIdentifier
28+
? identifier != null
29+
? '$identifier.$key'
30+
: key
31+
: key;
3132

32-
return MapEntry(finalKey, value);
33-
}));
33+
return MapEntry(finalKey, value);
34+
}),
35+
);
3436

3537
_values.addAll(mapEntry);
3638
}
@@ -43,10 +45,11 @@ class Placeholder implements PlaceholderContract {
4345
String apply(String value, {Map<String, dynamic>? values}) {
4446
String finalValue = value;
4547
if (values != null) {
46-
final currentValues = Map<String, dynamic>.from(values.map((key, value) =>
47-
identifier != null
48-
? MapEntry('$identifier.$key', value)
49-
: MapEntry(key, value)));
48+
final currentValues = Map<String, dynamic>.from(
49+
values.map((key, value) => identifier != null
50+
? MapEntry('$identifier.$key', value)
51+
: MapEntry(key, value)),
52+
);
5053

5154
finalValue = _replace(value, currentValues);
5255
}
@@ -55,17 +58,22 @@ class Placeholder implements PlaceholderContract {
5558
}
5659

5760
String _replace(String value, Map<String, dynamic> map) {
58-
return map.entries.fold(value, (acc, element) {
59-
final finalValue = switch (element.value) {
60-
String() => element.value,
61-
int() => element.value.toString(),
62-
_ => throw Exception('Invalid type')
63-
};
61+
return map.entries.fold(
62+
value,
63+
(acc, element) {
64+
final finalValue = switch (element.value) {
65+
String() => element.value,
66+
int() => element.value.toString(),
67+
_ => throw Exception('Invalid type')
68+
};
6469

65-
return acc
66-
.replaceAllMapped(RegExp(r'\{\{\s*([^}]*)\s*\}\}'),
67-
(Match m) => '{{${m[1]?.trim()}}}')
68-
.replaceAll('{{${element.key}}}', finalValue);
69-
});
70+
return acc
71+
.replaceAllMapped(
72+
RegExp(r'\{\{\s*([^}]*)\s*\}\}'),
73+
(Match m) => '{{${m[1]?.trim()}}}',
74+
)
75+
.replaceAll('{{${element.key}}}', finalValue);
76+
},
77+
);
7078
}
7179
}

0 commit comments

Comments
 (0)