Skip to content

Commit

Permalink
feat: use legacy code style
Browse files Browse the repository at this point in the history
  • Loading branch information
@Tienisto
Tienisto committed May 31, 2021
1 parent 209a34c commit 148affe
Show file tree
Hide file tree
Showing 16 changed files with 153 additions and 158 deletions.
12 changes: 6 additions & 6 deletions bin/fast_i18n.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ void main() async {
.where((item) => FileSystemEntity.isFileSync(item.path));

// build config
BuildConfig? buildConfig;
BuildConfig buildConfig;
for (final file in files) {
final fileName = file.path.getFileName();

Expand Down Expand Up @@ -70,16 +70,16 @@ void main() async {

// filter files according to build config
files = files.where((file) {
if (!file.path.endsWith(buildConfig!.inputFilePattern)) return false;
if (!file.path.endsWith(buildConfig.inputFilePattern)) return false;

if (buildConfig.inputDirectory != null &&
!file.path.contains(buildConfig.inputDirectory!)) return false;
!file.path.contains(buildConfig.inputDirectory)) return false;

return true;
});

// find base name
String? baseName;
String baseName;
for (final file in files) {
final fileName = file.path.getFileName();

Expand All @@ -103,7 +103,7 @@ void main() async {
print('Scanning translations...');
print('');
final translationList = <I18nData>[];
String? resultPath;
String resultPath;
for (final file in files) {
final fileName = file.path.getFileName();
final fileNameNoExtension =
Expand Down Expand Up @@ -141,7 +141,7 @@ void main() async {

if (buildConfig.outputDirectory != null) {
// output directory specified, use this path instead
resultPath = buildConfig.outputDirectory! +
resultPath = buildConfig.outputDirectory +
Platform.pathSeparator +
baseName +
buildConfig.outputFilePattern;
Expand Down
24 changes: 12 additions & 12 deletions lib/src/builder.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,24 +45,24 @@ class I18nBuilder implements Builder {
options.config['translate_var'] ?? BuildConfig.defaultTranslateVar,
enumName: options.config['enum_name'] ?? BuildConfig.defaultEnumName,
translationClassVisibility:
(options.config['translation_class_visibility'] as String?)
(options.config['translation_class_visibility'] as String)
?.toTranslationClassVisibility() ??
BuildConfig.defaultTranslationClassVisibility,
keyCase: (options.config['key_case'] as String?)?.toKeyCase() ??
keyCase: (options.config['key_case'] as String)?.toKeyCase() ??
BuildConfig.defaultKeyCase,
stringInterpolation: (options.config['string_interpolation'] as String?)
stringInterpolation: (options.config['string_interpolation'] as String)
?.toStringInterpolation() ??
BuildConfig.defaultStringInterpolation,
maps: options.config['maps']?.cast<String>() ?? BuildConfig.defaultMaps,
pluralCardinal:
options.config['pluralization']?['cardinal']?.cast<String>() ??
BuildConfig.defaultCardinal,
pluralOrdinal:
options.config['pluralization']?['ordinal']?.cast<String>() ??
BuildConfig.defaultOrdinal);
pluralCardinal: (options.config['pluralization'] ?? {})['cardinal']
?.cast<String>() ??
BuildConfig.defaultCardinal,
pluralOrdinal: (options.config['pluralization'] ?? {})['ordinal']
?.cast<String>() ??
BuildConfig.defaultOrdinal);

if (buildConfig.inputDirectory != null &&
!buildStep.inputId.path.contains(buildConfig.inputDirectory!)) return;
!buildStep.inputId.path.contains(buildConfig.inputDirectory)) return;

// only generate once
if (_generated) return;
Expand All @@ -71,7 +71,7 @@ class I18nBuilder implements Builder {

// detect all locales, their assetId and the baseName
final Map<AssetId, I18nLocale> assetMap = Map();
String? baseName;
String baseName;

final Glob findAssetsPattern = buildConfig.inputDirectory != null
? Glob('**${buildConfig.inputDirectory}/*$inputFilePattern')
Expand Down Expand Up @@ -118,7 +118,7 @@ class I18nBuilder implements Builder {
final String output = generate(
config: I18nConfig(
nullSafety: buildConfig.nullSafety,
baseName: baseName!,
baseName: baseName,
baseLocale: buildConfig.baseLocale,
renderedPluralizationResolvers: buildConfig
.pluralCardinal.isNotEmpty ||
Expand Down
3 changes: 1 addition & 2 deletions lib/src/generator/generate.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@ import 'package:fast_i18n/src/model/i18n_data.dart';

/// main generate function
/// returns a string representing the content of the .g.dart file
String generate(
{required I18nConfig config, required List<I18nData> translations}) {
String generate({I18nConfig config, List<I18nData> translations}) {
StringBuffer buffer = StringBuffer();

generateHeader(buffer, config, translations);
Expand Down
84 changes: 38 additions & 46 deletions lib/src/generator/generate_header.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,7 @@ void generateHeader(
}

void _generateHeaderComment(
{required StringBuffer buffer,
required I18nConfig config,
required List<I18nData> translations}) {
{StringBuffer buffer, I18nConfig config, List<I18nData> translations}) {
final now = DateTime.now().toUtc();
final int translationCount = translations.fold(
0, (prev, curr) => prev + _countTranslations(curr.root));
Expand All @@ -103,10 +101,10 @@ void _generateImports(StringBuffer buffer) {
}

void _generateLocaleVariables(
{required StringBuffer buffer,
required I18nConfig config,
required String baseLocaleVar,
required String currLocaleVar}) {
{StringBuffer buffer,
I18nConfig config,
String baseLocaleVar,
String currLocaleVar}) {
final String enumName = config.enumName;
final String baseLocale = config.baseLocale.toLanguageTag();

Expand All @@ -117,9 +115,7 @@ void _generateLocaleVariables(
}

void _generateEnum(
{required StringBuffer buffer,
required I18nConfig config,
required List<I18nData> allLocales}) {
{StringBuffer buffer, I18nConfig config, List<I18nData> allLocales}) {
final String enumName = config.enumName;
final String baseLocale = config.baseLocale.toLanguageTag();

Expand All @@ -140,11 +136,11 @@ void _generateEnum(
}

void _generateTranslationGetter(
{required StringBuffer buffer,
required I18nConfig config,
required String baseClassName,
required String currLocaleVar,
required String translateVarInternal}) {
{StringBuffer buffer,
I18nConfig config,
String baseClassName,
String currLocaleVar,
String translateVarInternal}) {
const String translationsClass = 'Translations';
final String translateVar = config.translateVariable;

Expand Down Expand Up @@ -202,16 +198,16 @@ void _generateTranslationGetter(
}

void _generateLocaleSettings(
{required StringBuffer buffer,
required I18nConfig config,
required List<I18nData> allLocales,
required String baseLocaleVar,
required String currLocaleVar,
required String translateVarInternal,
required String translationProviderKey,
required String pluralResolverType,
required String pluralResolverCardinal,
required String pluralResolverOrdinal}) {
{StringBuffer buffer,
I18nConfig config,
List<I18nData> allLocales,
String baseLocaleVar,
String currLocaleVar,
String translateVarInternal,
String translationProviderKey,
String pluralResolverType,
String pluralResolverCardinal,
String pluralResolverOrdinal}) {
const String settingsClass = 'LocaleSettings';
final String enumName = config.enumName;

Expand Down Expand Up @@ -334,10 +330,10 @@ void _generateLocaleSettings(
}

void _generateExtensions(
{required StringBuffer buffer,
required I18nConfig config,
required List<I18nData> allLocales,
required String baseClassName}) {
{StringBuffer buffer,
I18nConfig config,
List<I18nData> allLocales,
String baseClassName}) {
final String enumName = config.enumName;

// enum extension
Expand Down Expand Up @@ -399,11 +395,11 @@ void _generateExtensions(
}

void _generateTranslationWrapper(
{required StringBuffer buffer,
required I18nConfig config,
required String baseClassName,
required String translationProviderKey,
required String currLocaleVar}) {
{StringBuffer buffer,
I18nConfig config,
String baseClassName,
String translationProviderKey,
String currLocaleVar}) {
const String translationProviderClass = 'TranslationProvider';
const String translationProviderStateClass = '_TranslationProviderState';
const String inheritedClass = '_InheritedLocaleData';
Expand Down Expand Up @@ -466,12 +462,12 @@ void _generateTranslationWrapper(
}

void _generatePluralResolvers(
{required StringBuffer buffer,
required I18nConfig config,
required List<PluralizationResolver> languageRules,
required String pluralResolverType,
required String pluralResolverCardinal,
required String pluralResolverOrdinal}) {
{StringBuffer buffer,
I18nConfig config,
List<PluralizationResolver> languageRules,
String pluralResolverType,
String pluralResolverCardinal,
String pluralResolverOrdinal}) {
buffer.writeln();
buffer.writeln('// pluralization resolvers');

Expand Down Expand Up @@ -518,10 +514,7 @@ void _generatePluralResolvers(

/// generates the function without function name
void _generatePluralFunction(
{required StringBuffer buffer,
required I18nConfig config,
required RuleSet ruleSet,
required functionName}) {
{StringBuffer buffer, I18nConfig config, RuleSet ruleSet, functionName}) {
buffer.write('String $functionName(num n, {');
for (int i = 0; i < Quantity.values.length; i++) {
if (i != 0) buffer.write(', ');
Expand All @@ -538,8 +531,7 @@ void _generatePluralFunction(
buffer.writeln('}');
}

void _generateHelpers(
{required StringBuffer buffer, required I18nConfig config}) {
void _generateHelpers({StringBuffer buffer, I18nConfig config}) {
final enumName = config.enumName;
buffer.writeln();
buffer.writeln('// helpers');
Expand Down
28 changes: 14 additions & 14 deletions lib/src/generator/generate_translations.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ void generateTranslations(
));

final pluralizationResolver = config.renderedPluralizationResolvers
.cast<PluralizationResolver?>()
.cast<PluralizationResolver>()
.firstWhere((r) => r?.language == localeData.locale.language,
orElse: () => null);

Expand Down Expand Up @@ -63,7 +63,7 @@ void _generateClass(
bool base,
String language,
String locale,
PluralizationResolver? pluralizationResolver,
PluralizationResolver pluralizationResolver,
StringBuffer buffer,
Queue<ClassTask> queue,
String className,
Expand Down Expand Up @@ -165,7 +165,7 @@ void _generateMap(
bool base,
String language,
String locale,
PluralizationResolver? pluralizationResolver,
PluralizationResolver pluralizationResolver,
StringBuffer buffer,
Queue<ClassTask> queue,
String className, // without locale
Expand Down Expand Up @@ -239,7 +239,7 @@ void _generateList(
I18nConfig config,
bool base,
String locale,
PluralizationResolver? pluralizationResolver,
PluralizationResolver pluralizationResolver,
StringBuffer buffer,
Queue<ClassTask> queue,
String className,
Expand Down Expand Up @@ -295,7 +295,7 @@ generateTranslationMap(

for (I18nData localeData in translations) {
final pluralizationResolver = config.renderedPluralizationResolvers
.cast<PluralizationResolver?>()
.cast<PluralizationResolver>()
.firstWhere((r) => r?.language == localeData.locale.language,
orElse: () => null);

Expand All @@ -314,7 +314,7 @@ _generateTranslationMapRecursive(
Node parent,
String path,
I18nConfig config,
PluralizationResolver? pluralizationResolver,
PluralizationResolver pluralizationResolver,
String language) {
if (parent is ObjectNode) {
parent.entries.forEach((key, value) {
Expand Down Expand Up @@ -376,14 +376,14 @@ String _toParameterList(List<String> params, I18nConfig config) {
}

void _addPluralizationCall(
{required StringBuffer buffer,
required I18nConfig config,
required PluralizationResolver? resolver,
required String language,
required bool cardinal,
required String key,
required Map<String, Node> children,
required int depth}) {
{StringBuffer buffer,
I18nConfig config,
PluralizationResolver resolver,
String language,
bool cardinal,
String key,
Map<String, Node> children,
int depth}) {
final textNodeList = children.values.cast<TextNode>().toList();

if (textNodeList.isEmpty) {
Expand Down
6 changes: 3 additions & 3 deletions lib/src/generator/helper.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@ import 'package:fast_i18n/src/model/i18n_config.dart';
import 'package:fast_i18n/src/string_extensions.dart';

String getClassNameRoot(
{required String baseName,
{String baseName,
String locale = '',
required TranslationClassVisibility visibility}) {
TranslationClassVisibility visibility}) {
String result = baseName.toCase(KeyCase.pascal) +
locale.toLowerCase().toCase(KeyCase.pascal);
if (visibility == TranslationClassVisibility.private) result = '_' + result;
return result;
}

String getClassName(
{required String parentName, String childName = '', String locale = ''}) {
{String parentName, String childName = '', String locale = ''}) {
return parentName +
childName.toCase(KeyCase.pascal) +
locale.toLowerCase().toCase(KeyCase.pascal);
Expand Down
Loading

0 comments on commit 148affe

Please sign in to comment.