Skip to content

Expand UTF-8 to ASCII transliteration map #834

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

Open
sheva-di wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Expand UTF-8 to ASCII transliteration map #834

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion lib/src/code_generators/enum_model.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import 'package:recase/recase.dart';
import 'package:swagger_dart_code_generator/src/exception_words.dart';
import 'package:swagger_dart_code_generator/src/extensions/convert_utf8_to_ascii.dart';
import 'package:swagger_dart_code_generator/src/extensions/string_extension.dart';

class EnumModel {
Expand Down Expand Up @@ -35,7 +36,7 @@ class EnumModel {
var validatedValue = enumNames.isNotEmpty ? enumNames[i] : value;

validatedValue = getValidatedEnumFieldName(
validatedValue,
convertUtf8ToAscii(validatedValue),
value,
isInteger,
allFieldNames,
Expand Down
31 changes: 1 addition & 30 deletions lib/src/code_generators/swagger_models_generator.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import 'package:swagger_dart_code_generator/src/code_generators/enum_model.dart'
import 'package:swagger_dart_code_generator/src/code_generators/swagger_generator_base.dart';
import 'package:swagger_dart_code_generator/src/code_generators/swagger_requests_generator.dart';
import 'package:swagger_dart_code_generator/src/exception_words.dart';
import 'package:swagger_dart_code_generator/src/extensions/convert_utf8_to_ascii.dart';
import 'package:swagger_dart_code_generator/src/extensions/string_extension.dart';
import 'package:swagger_dart_code_generator/src/models/generator_options.dart';
import 'package:swagger_dart_code_generator/src/swagger_models/responses/swagger_schema.dart';
Expand Down Expand Up @@ -323,36 +324,6 @@ abstract class SwaggerModelsGenerator extends SwaggerGeneratorBase {
return converters + results + allEnumsString;
}

static String convertUtf8ToAscii(String input) {
const diacriticsMap = {
'ą': 'a',
'ć': 'c',
'ę': 'e',
'ł': 'l',
'ń': 'n',
'ó': 'o',
'ś': 's',
'ź': 'z',
'ż': 'z',
'Ą': 'A',
'Ć': 'C',
'Ę': 'E',
'Ł': 'L',
'Ń': 'N',
'Ó': 'O',
'Ś': 'S',
'Ź': 'Z',
'Ż': 'Z',
};

var output = StringBuffer();
for (var char in input.split('')) {
output.write(diacriticsMap[char] ?? char);
}

return output.toString();
}

static String getValidatedParameterName(String parameterName) {
if (parameterName.isEmpty) {
return parameterName;
Expand Down
Loading
Loading